Add native support for Apple Silicon
After this PR, we can use a x86 version of Bazel to build an ARM64 Bazel binary for Apple Silicon by
```
bazel build --cpu=darwin_arm64 //src:bazel
```
The Bazel client, embedded tools and embedded JDK are all native ARM64 binaries.
Changes in this PR:
1. Add OpenJDK definitions for ARM64 macOS
2. Manually created the embedded JDK binaries on an Apple Silicon machine and uploaded them to the bazel mirror site.
3. AutoCpuConverter.java: identify the cpu value correctly
4. cc_toolchain_config.bzl: Explicitly specify the target platform also in the x86 cc toolchain, so that we can also do cross-platform compile from ARM64 to x86.
With the native arm64 Bazel binary, building Bazel itself takes only half of the time compared with the x86 Bazel binary on an Apple DTK machine:
```
$ bazel build --cpu=darwin_arm64 --disk_cache= --repository_cache= //src:bazel
Starting local Bazel server and connecting to it...
...
Target //src:bazel up-to-date:
bazel-bin/src/bazel
INFO: Elapsed time: 1044.462s, Critical Path: 180.08s
INFO: 2984 processes: 179 internal, 2092 darwin-sandbox, 1 local, 712 worker.
INFO: Build completed successfully, 2984 total actions
cp ./bazel-bin/src/bazel ~/bin/bazel-arm64
$ bazel-arm64 clean --expunge
$ bazel-arm64 build --disk_cache= --repository_cache= //src:bazel
Starting local Bazel server and connecting to it...
...
Target //src:bazel up-to-date:
bazel-bin/src/bazel
INFO: Elapsed time: 464.470s, Critical Path: 114.88s
INFO: 2984 processes: 179 internal, 2092 darwin-sandbox, 1 local, 712 worker.
INFO: Build completed successfully, 2984 total actions
```
Closes: https://github.com/bazelbuild/bazel/issues/11628
Closes #12900.
PiperOrigin-RevId: 354058336
diff --git a/WORKSPACE b/WORKSPACE
index 6c0058e..42a443d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -228,6 +228,30 @@
)
http_file(
+ name = "openjdk_macos_aarch64",
+ downloaded_file_path = "zulu-macos-aarch64.tar.gz",
+ sha256 = "a900ef793cb34b03ac5d93ea2f67291b6842e99d500934e19393a8d8f9bfa6ff",
+ urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-allmodules-1611665569.tar.gz"],
+)
+
+http_file(
+ name = "openjdk_macos_aarch64_vanilla",
+ downloaded_file_path = "zulu-macos-aarch64-vanilla.tar.gz",
+ sha256 = "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a",
+ urls = [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
+ ],
+)
+
+http_file(
+ name = "openjdk_macos_aarch64_minimal",
+ downloaded_file_path = "zulu-macos-aarch64-minimal.tar.gz",
+ sha256 = "f4f606926e6deeaa8b8397e299313d9df87642fe464b0ccf1ed0432aeb00640b",
+ urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-minimal-1611665562.tar.gz"],
+)
+
+http_file(
name = "openjdk_win",
downloaded_file_path = "zulu-win.zip",
sha256 = "8e1604b3a27dcf639bc6d1a73103f1211848139e4cceb081d0a74a99e1e6f995",
@@ -322,6 +346,7 @@
"zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz",
"zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz",
"zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz",
+ "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
"zulu11.37.17-ca-jdk11.0.6-win_x64.zip",
"android_tools_pkg-0.19.0rc3.tar.gz",
],
@@ -331,6 +356,7 @@
"zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1",
"zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4",
"zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f",
+ "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a",
"zulu11.37.17-ca-jdk11.0.6-win_x64.zip": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18",
"android_tools_pkg-0.19.0rc3.tar.gz": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837",
},
@@ -338,6 +364,7 @@
"zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"],
"zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz"],
"zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz"],
+ "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz": ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz"],
"zulu11.37.17-ca-jdk11.0.6-win_x64.zip": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"],
"android_tools_pkg-0.19.0rc3.tar.gz": [
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz",
@@ -477,6 +504,20 @@
# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.
http_archive(
+ name = "remotejdk11_macos_aarch64_for_testing",
+ build_file = "@local_jdk//:BUILD.bazel",
+ patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
+ patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
+ sha256 = "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a",
+ strip_prefix = "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64",
+ urls = [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
+ ],
+)
+
+# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.
+http_archive(
name = "remotejdk11_win_for_testing",
build_file = "@local_jdk//:BUILD.bazel",
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
@@ -516,6 +557,20 @@
# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.
http_archive(
+ name = "remotejdk15_macos_aarch64_for_testing",
+ build_file = "@local_jdk//:BUILD.bazel",
+ patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
+ patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
+ sha256 = "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5",
+ strip_prefix = "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64",
+ urls = [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz",
+ ],
+)
+
+# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.
+http_archive(
name = "remotejdk15_win_for_testing",
build_file = "@local_jdk//:BUILD.bazel",
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
@@ -610,6 +665,21 @@
# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
http_archive(
+ name = "openjdk11_darwin_aarch64_archive",
+ build_file_content = """
+java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
+exports_files(["WORKSPACE"], visibility = ["//visibility:public"])
+""",
+ sha256 = "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a",
+ strip_prefix = "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64",
+ urls = [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
+ ],
+)
+
+# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
+http_archive(
name = "openjdk11_windows_archive",
build_file_content = """
java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
@@ -652,6 +722,21 @@
# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
http_archive(
+ name = "openjdk15_darwin_aarch64_archive",
+ build_file_content = """
+java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
+exports_files(["WORKSPACE"], visibility = ["//visibility:public"])
+""",
+ sha256 = "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5",
+ strip_prefix = "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64",
+ urls = [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz",
+ ],
+)
+
+# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
+http_archive(
name = "openjdk15_windows_archive",
build_file_content = """
java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
diff --git a/src/BUILD b/src/BUILD
index ad767d8..e561cef 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -177,6 +177,9 @@
"//src/conditions:darwin_x86_64": [
"@openjdk_macos_x86_64//file",
],
+ "//src/conditions:darwin_arm64": [
+ "@openjdk_macos_aarch64//file",
+ ],
"//src/conditions:windows": [
"@openjdk_win//file",
],
@@ -196,6 +199,9 @@
"//src/conditions:darwin_x86_64": [
"@openjdk_macos_x86_64_minimal//file",
],
+ "//src/conditions:darwin_arm64": [
+ "@openjdk_macos_aarch64_minimal//file",
+ ],
"//src/conditions:windows": [
"@openjdk_win_minimal//file",
],
@@ -215,6 +221,9 @@
"//src/conditions:darwin_x86_64": [
"@openjdk_macos_x86_64_vanilla//file",
],
+ "//src/conditions:darwin_arm64": [
+ "@openjdk_macos_aarch64_vanilla//file",
+ ],
"//src/conditions:windows": [
"@openjdk_win_vanilla//file",
],
@@ -699,14 +708,17 @@
"@android_tools_for_testing//:WORKSPACE",
"@bazel_skylib//:WORKSPACE",
"@com_google_protobuf//:WORKSPACE",
+ "@openjdk11_darwin_aarch64_archive//:WORKSPACE",
"@openjdk11_darwin_archive//:WORKSPACE",
"@openjdk11_linux_archive//:WORKSPACE",
"@openjdk11_windows_archive//:WORKSPACE",
+ "@openjdk15_darwin_aarch64_archive//:WORKSPACE",
"@openjdk15_darwin_archive//:WORKSPACE",
"@openjdk15_linux_archive//:WORKSPACE",
"@openjdk15_windows_archive//:WORKSPACE",
"@openjdk_linux_aarch64_minimal//file",
"@openjdk_linux_minimal//file",
+ "@openjdk_macos_aarch64_minimal//file",
"@openjdk_macos_x86_64_minimal//file",
"@openjdk_win_minimal//file",
"@remote_coverage_tools//:WORKSPACE",
@@ -722,9 +734,11 @@
"@remotejdk11_linux_for_testing//:WORKSPACE",
"@remotejdk11_linux_ppc64le_for_testing//:WORKSPACE",
"@remotejdk11_linux_s390x_for_testing//:WORKSPACE",
+ "@remotejdk11_macos_aarch64_for_testing//:WORKSPACE",
"@remotejdk11_macos_for_testing//:WORKSPACE",
"@remotejdk11_win_for_testing//:WORKSPACE",
"@remotejdk15_linux_for_testing//:WORKSPACE",
+ "@remotejdk15_macos_aarch64_for_testing//:WORKSPACE",
"@remotejdk15_macos_for_testing//:WORKSPACE",
"@remotejdk15_win_for_testing//:WORKSPACE",
"@rules_cc//:WORKSPACE",
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/AutoCpuConverter.java b/src/main/java/com/google/devtools/build/lib/analysis/config/AutoCpuConverter.java
index c0edc7c..6426cb6 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/AutoCpuConverter.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/AutoCpuConverter.java
@@ -31,10 +31,17 @@
public String convert(String input) throws OptionsParsingException {
if (input.isEmpty()) {
// TODO(philwo) - replace these deprecated names with more logical ones (e.g. k8 becomes
- // linux-x86_64, darwin includes the CPU architecture, ...).
+ // linux-x86_64 ...).
switch (OS.getCurrent()) {
case DARWIN:
- return "darwin";
+ switch (CPU.getCurrent()) {
+ case X86_64:
+ return "darwin_x86_64";
+ case AARCH64:
+ return "darwin_arm64";
+ default:
+ return "unknown";
+ }
case FREEBSD:
return "freebsd";
case OPENBSD:
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl
index 857a7af..11ad1be 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl
@@ -102,6 +102,23 @@
# This must be kept in sync with the top-level WORKSPACE file.
maybe(
remote_java_repository,
+ name = "remotejdk11_macos_aarch64",
+ exec_compatible_with = [
+ "@platforms//os:macos",
+ "@platforms//cpu:aarch64",
+ ],
+ sha256 = "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a",
+ strip_prefix = "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64",
+ urls = [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
+ ],
+ version = "11",
+)
+
+# This must be kept in sync with the top-level WORKSPACE file.
+maybe(
+ remote_java_repository,
name = "remotejdk11_win",
exec_compatible_with = [
"@platforms//os:windows",
@@ -152,6 +169,23 @@
# This must be kept in sync with the top-level WORKSPACE file.
maybe(
remote_java_repository,
+ name = "remotejdk15_macos_aarch64",
+ exec_compatible_with = [
+ "@platforms//os:macos",
+ "@platforms//cpu:aarch64",
+ ],
+ sha256 = "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5",
+ strip_prefix = "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64",
+ urls = [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz",
+ ],
+ version = "15",
+)
+
+# This must be kept in sync with the top-level WORKSPACE file.
+maybe(
+ remote_java_repository,
name = "remotejdk15_win",
exec_compatible_with = [
"@platforms//os:windows",
diff --git a/src/test/py/bazel/test_base.py b/src/test/py/bazel/test_base.py
index 401a515..350b8ec 100644
--- a/src/test/py/bazel/test_base.py
+++ b/src/test/py/bazel/test_base.py
@@ -62,9 +62,11 @@
'remotejdk11_linux_ppc64le_for_testing',
'remotejdk11_linux_s390x_for_testing',
'remotejdk11_macos_for_testing',
+ 'remotejdk11_macos_aarch64_for_testing',
'remotejdk11_win_for_testing',
'remotejdk15_linux_for_testing',
'remotejdk15_macos_for_testing',
+ 'remotejdk15_macos_aarch64_for_testing',
'remotejdk15_win_for_testing',
'remote_java_tools_for_testing',
'remote_java_tools_darwin_for_testing',
diff --git a/src/test/shell/bazel/testdata/jdk_http_archives.tmpl b/src/test/shell/bazel/testdata/jdk_http_archives.tmpl
index d2f4aa0..a26b719 100644
--- a/src/test/shell/bazel/testdata/jdk_http_archives.tmpl
+++ b/src/test/shell/bazel/testdata/jdk_http_archives.tmpl
@@ -1,3 +1,4 @@
+
################### Remote java_tools with embedded javac 11 ###################
{remote_java_tools_test}
{remote_java_tools_test_linux}
@@ -23,6 +24,17 @@
)
# This must be kept in sync with the top-level WORKSPACE file.
http_archive(
+ name = "openjdk11_darwin_aarch64_archive",
+ build_file_content = "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])",
+ sha256 = "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a",
+ strip_prefix = "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64",
+ urls = [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
+ ],
+)
+# This must be kept in sync with the top-level WORKSPACE file.
+http_archive(
name = "openjdk11_windows_archive",
build_file_content = "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])",
sha256 = "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18",
@@ -61,6 +73,20 @@
)
# This must be kept in sync with the top-level WORKSPACE file.
http_archive(
+ name = "openjdk15_darwin_aarch64_archive",
+ build_file_content = """
+java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
+exports_files(["WORKSPACE"], visibility = ["//visibility:public"])
+""",
+ sha256 = "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5",
+ strip_prefix = "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64",
+ urls = [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz",
+ ],
+)
+# This must be kept in sync with the top-level WORKSPACE file.
+http_archive(
name = "openjdk15_windows_archive",
build_file_content = """
java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
diff --git a/src/test/shell/testenv.sh.tmpl b/src/test/shell/testenv.sh.tmpl
index d213f77..bf3fb04 100755
--- a/src/test/shell/testenv.sh.tmpl
+++ b/src/test/shell/testenv.sh.tmpl
@@ -286,14 +286,17 @@
"bazel_toolchains"
"com_google_protobuf"
"openjdk11_darwin_archive"
+ "openjdk11_darwin_aarch64_archive"
"openjdk11_linux_archive"
"openjdk11_windows_archive"
"openjdk15_darwin_archive"
+ "openjdk15_darwin_aarch64_archive"
"openjdk15_linux_archive"
"openjdk15_windows_archive"
"openjdk_linux_aarch64_minimal"
"openjdk_linux_minimal"
"openjdk_macos_x86_64_minimal"
+ "openjdk_macos_aarch64_minimal"
"openjdk_win_minimal"
"remote_coverage_tools"
"remote_java_tools_for_testing"
@@ -309,9 +312,11 @@
"remotejdk11_linux_ppc64le_for_testing"
"remotejdk11_linux_s390x_for_testing"
"remotejdk11_macos_for_testing"
+ "remotejdk11_macos_aarch64_for_testing"
"remotejdk11_win_for_testing"
"remotejdk15_linux_for_testing"
"remotejdk15_macos_for_testing"
+ "remotejdk15_macos_aarch64_for_testing"
"remotejdk15_win_for_testing"
"rules_cc"
"rules_java"
diff --git a/tools/cpp/cc_configure.bzl b/tools/cpp/cc_configure.bzl
index 406425c..c72cd9f8 100644
--- a/tools/cpp/cc_configure.bzl
+++ b/tools/cpp/cc_configure.bzl
@@ -56,7 +56,7 @@
if not should_detect_cpp_toolchain:
repository_ctx.file("BUILD", "# C++ toolchain autoconfiguration was disabled by BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN env variable.")
- elif cpu_value == "darwin" and not should_use_cpp_only_toolchain:
+ elif cpu_value.startswith("darwin") and not should_use_cpp_only_toolchain:
xcode_toolchains = []
# Only detect xcode if the user didn't tell us it will be there.
@@ -120,7 +120,7 @@
# TODO(ibiryukov): overriden_tools are only supported in configure_unix_toolchain.
# We might want to add that to Windows too(at least for msys toolchain).
configure_windows_toolchain(repository_ctx)
- elif (cpu_value == "darwin" and
+ 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)
else:
diff --git a/tools/cpp/lib_cc_configure.bzl b/tools/cpp/lib_cc_configure.bzl
index ee89b9d..4aef9c1 100644
--- a/tools/cpp/lib_cc_configure.bzl
+++ b/tools/cpp/lib_cc_configure.bzl
@@ -181,7 +181,9 @@
"""Compute the cpu_value based on the OS name. Doesn't %-escape the result!"""
os_name = repository_ctx.os.name.lower()
if os_name.startswith("mac os"):
- return "darwin"
+ # Check if we are on x86_64 or arm64 and return the corresponding cpu value.
+ result = repository_ctx.execute(["uname", "-m"])
+ return "darwin_" + result.stdout.strip()
if os_name.find("freebsd") != -1:
return "freebsd"
if os_name.find("openbsd") != -1:
diff --git a/tools/osx/crosstool/cc_toolchain_config.bzl b/tools/osx/crosstool/cc_toolchain_config.bzl
index d95dfbc..0d541bf 100644
--- a/tools/osx/crosstool/cc_toolchain_config.bzl
+++ b/tools/osx/crosstool/cc_toolchain_config.bzl
@@ -3851,7 +3851,11 @@
["objc-executable", "objc++-executable"],
flag_groups = [
flag_group(
- flags = ["-no-canonical-prefixes"],
+ flags = [
+ "-no-canonical-prefixes",
+ "-target",
+ "x86_64-apple-macosx",
+ ],
),
],
),
@@ -5159,8 +5163,38 @@
),
],
)
- elif (ctx.attr.cpu == "armeabi-v7a" or
- ctx.attr.cpu == "darwin_x86_64"):
+ elif (ctx.attr.cpu == "darwin_x86_64"):
+ unfiltered_compile_flags_feature = feature(
+ name = "unfiltered_compile_flags",
+ flag_sets = [
+ flag_set(
+ actions = [
+ ACTION_NAMES.assemble,
+ ACTION_NAMES.preprocess_assemble,
+ ACTION_NAMES.c_compile,
+ ACTION_NAMES.cpp_compile,
+ ACTION_NAMES.cpp_header_parsing,
+ ACTION_NAMES.cpp_module_compile,
+ ACTION_NAMES.cpp_module_codegen,
+ ACTION_NAMES.linkstamp_compile,
+ ],
+ flag_groups = [
+ flag_group(
+ flags = [
+ "-no-canonical-prefixes",
+ "-Wno-builtin-macro-redefined",
+ "-D__DATE__=\"redacted\"",
+ "-D__TIMESTAMP__=\"redacted\"",
+ "-D__TIME__=\"redacted\"",
+ "-target",
+ "x86_64-apple-macosx",
+ ],
+ ),
+ ],
+ ),
+ ],
+ )
+ elif (ctx.attr.cpu == "armeabi-v7a"):
unfiltered_compile_flags_feature = feature(
name = "unfiltered_compile_flags",
flag_sets = [
