Fix unix toolchain for macos arm64 platform

meteorcloudy · copybara-github · commit b4b0c321910b · 2021-05-25T08:34:44.000-07:00
This allow the basic unix toolchain to work on Apple silicon without Xcode installed. Fixes bazelbuild#13514 Closes bazelbuild#13515. PiperOrigin-RevId: 375711139
diff --git a/tools/cpp/cc_configure.bzl b/tools/cpp/cc_configure.bzl
@@ -122,7 +122,7 @@ def cc_autoconf_impl(repository_ctx, overriden_tools = dict()):
         configure_windows_toolchain(repository_ctx)
     elif (cpu_value.startswith("darwin") and
           ("BAZEL_USE_CPP_ONLY_TOOLCHAIN" not in env or env["BAZEL_USE_CPP_ONLY_TOOLCHAIN"] != "1")):
-        configure_osx_toolchain(repository_ctx, overriden_tools)
+        configure_osx_toolchain(repository_ctx, cpu_value, overriden_tools)
     else:
         configure_unix_toolchain(repository_ctx, cpu_value, overriden_tools)
 
diff --git a/tools/cpp/osx_cc_configure.bzl b/tools/cpp/osx_cc_configure.bzl
@@ -83,7 +83,7 @@ def _compile_cc_file(repository_ctx, src_name, out_name):
              "https://github.com/bazelbuild/bazel/issues with the following:\n" +
              error_msg)
 
-def configure_osx_toolchain(repository_ctx, overriden_tools):
+def configure_osx_toolchain(repository_ctx, cpu_value, overriden_tools):
     """Configure C++ toolchain on macOS.
 
     Args:
@@ -187,4 +187,4 @@ def configure_osx_toolchain(repository_ctx, overriden_tools):
             },
         )
     else:
-        configure_unix_toolchain(repository_ctx, cpu_value = "darwin", overriden_tools = overriden_tools)
+        configure_unix_toolchain(repository_ctx, cpu_value, overriden_tools = overriden_tools)
diff --git a/tools/cpp/unix_cc_configure.bzl b/tools/cpp/unix_cc_configure.bzl
@@ -331,7 +331,7 @@ def configure_unix_toolchain(repository_ctx, cpu_value, overriden_tools):
     )
 
     repository_ctx.file("tools/cpp/empty.cc", "int main() {}")
-    darwin = cpu_value == "darwin"
+    darwin = cpu_value.startswith("darwin")
 
     cc = _find_generic(repository_ctx, "gcc", "CC", overriden_tools)
     is_clang = _is_clang(repository_ctx, cc)

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ def configure_unix_toolchain(repository_ctx, cpu_value, overriden_tools):`
`331`	`331`	`)`
`332`	`332`
`333`	`333`	`repository_ctx.file("tools/cpp/empty.cc", "int main() {}")`
`334`		`- darwin = cpu_value == "darwin"`
	`334`	`+ darwin = cpu_value.startswith("darwin")`
`335`	`335`
`336`	`336`	`cc = _find_generic(repository_ctx, "gcc", "CC", overriden_tools)`
`337`	`337`	`is_clang = _is_clang(repository_ctx, cc)`