Add darwin_x86_64 to toolchain setup

bazelbuild · Jan 9, 2019 · 4900300 · 4900300
1 parent edf7375
commit 4900300
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/tools/cpp/BUILD b/tools/cpp/BUILD
@@ -90,6 +90,7 @@ cc_toolchain_suite(
     toolchains = {
         "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
         "darwin|compiler": ":cc-compiler-darwin",
+        "darwin_x86_64|compiler": ":cc-compiler-darwin",
         "freebsd|compiler": ":cc-compiler-freebsd",
         "local|compiler": ":cc-compiler-local",
         "x64_windows|compiler": ":cc-compiler-x64_windows",
@@ -103,6 +104,7 @@ cc_toolchain_suite(
         "ppc": ":cc-compiler-local",
         "ppc64": ":cc-compiler-local",
         "darwin": ":cc-compiler-darwin",
+        "darwin_x86_64": ":cc-compiler-darwin",
         "freebsd": ":cc-compiler-freebsd",
         "armeabi-v7a": ":cc-compiler-armeabi-v7a",
         "x64_windows": ":cc-compiler-x64_windows",

diff --git a/tools/osx/crosstool/BUILD.tpl b/tools/osx/crosstool/BUILD.tpl
@@ -11,8 +11,10 @@ CC_TOOLCHAINS = [(
 ) for cpu in OSX_TOOLS_ARCHS] + [
     ("k8|compiler", ":cc-compiler-darwin_x86_64", ),
     ("darwin|compiler", ":cc-compiler-darwin_x86_64", ),
+    ("darwin_x86_64|compiler", ":cc-compiler-darwin_x86_64", ),
     ("k8", ":cc-compiler-darwin_x86_64", ),
     ("darwin", ":cc-compiler-darwin_x86_64", ),
+    ("darwin_x86_64", ":cc-compiler-darwin_x86_64", ),
 ]
 
 cc_library(