From 92d0012c909daa0a8f9bfdb9b1dc3d14dec4edbf Mon Sep 17 00:00:00 2001 From: Niyas Sait Date: Tue, 22 Mar 2022 18:41:14 +0000 Subject: [PATCH] use ctx.os.arch to get architecture --- go/private/sdk.bzl | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/go/private/sdk.bzl b/go/private/sdk.bzl index 906259ef66..4acdc2eade 100644 --- a/go/private/sdk.bzl +++ b/go/private/sdk.bzl @@ -237,12 +237,6 @@ def _sdk_build_file(ctx, platform): }, ) -def _get_env_var(ctx, name, default = ""): - if name in ctx.os.environ: - return ctx.os.environ[name] - else: - return default - def _detect_host_platform(ctx): if ctx.os.name == "linux": goos, goarch = "linux", "amd64" @@ -282,11 +276,11 @@ def _detect_host_platform(ctx): # Default to amd64 when uname doesn't return a known value. elif ctx.os.name.startswith("windows"): - goos, goarch = "windows", "amd64" - if _get_env_var(ctx, "PROCESSOR_ARCHITECTURE") == "ARM64": - goarch = "arm64" - elif _get_env_var(ctx, "PROCESSOR_ARCHITEW6432") == "ARM64": + goos = "windows" + if ctx.os.arch == "aarch64": goarch = "arm64" + else: + goarch = "amd64" elif ctx.os.name == "freebsd": goos, goarch = "freebsd", "amd64" else: