motiejus/hermetic_cc_toolchain
1
Fork 0
Code Releases Activity

Interpret arm64 output from uname as aarch64 on mac OS

Browse Source
This commit is contained in:
Ken Micklas 2022-02-10 18:22:37 -05:00 committed by Motiejus Jakštys
parent dc138b490a
commit 77688d0a45
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
toolchain/defs.bzl
View File

@ -222,12 +222,15 @@ def _zig_repository_impl(repository_ctx):
res = repository_ctx.execute(["uname", "-m"]) res = repository_ctx.execute(["uname", "-m"])
if res.return_code != 0: if res.return_code != 0:
fail("failed to run uname -m") fail("failed to run uname -m")
uname = res.stdout.strip() arch = res.stdout.strip()
os = "linux"
if repository_ctx.os.name.lower().startswith("mac os"): if repository_ctx.os.name.lower().startswith("mac os"):
host_platform = "macos-{}".format(uname) os = "macos"
else: if arch == "arm64":
host_platform = "linux-{}".format(uname) # uname -m reports arm64 on an M1 Mac.
arch = "aarch64"
host_platform = "{}-{}".format(os, arch)
zig_include_root = repository_ctx.attr.host_platform_include_root[host_platform] zig_include_root = repository_ctx.attr.host_platform_include_root[host_platform]
zig_sha256 = repository_ctx.attr.host_platform_sha256[host_platform] zig_sha256 = repository_ctx.attr.host_platform_sha256[host_platform]