aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/osx/crosstool
diff options
context:
space:
mode:
authorGravatar hlopko <hlopko@google.com>2017-06-20 11:15:19 -0400
committerGravatar Kristina Chodorow <kchodorow@google.com>2017-06-20 14:37:03 -0400
commit41f6283ba7ca4e663623df276f045efb8550e90b (patch)
tree29b7063903c776f46dcb1821193b886bcfb1fc9b /tools/osx/crosstool
parent39dbf830019365de49be43982daf36e504c6c11c (diff)
Use wrapped_ar on darwin in cc_configure.bzl
Tool.AR is used by go rules, and the inconsistency fixed in this cl was causing a bug. Fixes #3184. RELNOTES: None. PiperOrigin-RevId: 159562216
Diffstat (limited to 'tools/osx/crosstool')
-rw-r--r--tools/osx/crosstool/CROSSTOOL.tpl18
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/osx/crosstool/CROSSTOOL.tpl b/tools/osx/crosstool/CROSSTOOL.tpl
index dfa03b6151..b1eab6b076 100644
--- a/tools/osx/crosstool/CROSSTOOL.tpl
+++ b/tools/osx/crosstool/CROSSTOOL.tpl
@@ -67,7 +67,7 @@ toolchain {
abi_libc_version: "darwin_x86_64"
tool_path {
name: "ar"
- path: "/usr/bin/libtool"
+ path: "wrapped_ar"
}
tool_path {
name: "compat-ld"
@@ -1317,7 +1317,7 @@ toolchain {
abi_libc_version: "local"
tool_path {
name: "ar"
- path: "/usr/bin/libtool"
+ path: "wrapped_ar"
}
tool_path {
name: "compat-ld"
@@ -2578,7 +2578,7 @@ toolchain {
abi_libc_version: "local"
tool_path {
name: "ar"
- path: "/usr/bin/libtool"
+ path: "wrapped_ar"
}
tool_path {
name: "compat-ld"
@@ -3841,7 +3841,7 @@ toolchain {
abi_libc_version: "local"
tool_path {
name: "ar"
- path: "/usr/bin/libtool"
+ path: "wrapped_ar"
}
tool_path {
name: "compat-ld"
@@ -5141,7 +5141,7 @@ toolchain {
abi_libc_version: "local"
tool_path {
name: "ar"
- path: "/usr/bin/libtool"
+ path: "wrapped_ar"
}
tool_path {
name: "compat-ld"
@@ -6402,7 +6402,7 @@ toolchain {
abi_libc_version: "local"
tool_path {
name: "ar"
- path: "/usr/bin/libtool"
+ path: "wrapped_ar"
}
tool_path {
name: "compat-ld"
@@ -7648,7 +7648,7 @@ toolchain {
abi_libc_version: "local"
tool_path {
name: "ar"
- path: "/usr/bin/libtool"
+ path: "wrapped_ar"
}
tool_path {
name: "compat-ld"
@@ -8896,7 +8896,7 @@ toolchain {
abi_libc_version: "local"
tool_path {
name: "ar"
- path: "/usr/bin/libtool"
+ path: "wrapped_ar"
}
tool_path {
name: "compat-ld"
@@ -10181,7 +10181,7 @@ toolchain {
abi_libc_version: "local"
tool_path {
name: "ar"
- path: "/usr/bin/libtool"
+ path: "wrapped_ar"
}
tool_path {
name: "compat-ld"