Find libtool when using BAZEL_USE_CPP_ONLY_TOOLCHAIN.

uri-canva · copybara-github · commit 3c47b4716e6e · 2023-01-23T01:57:56.000-08:00
Instead of hardcoding `/usr/bin/libtool` which requires Xcode / Xcode CLT installed, which `BAZEL_USE_CPP_ONLY_TOOLCHAIN` is meant to avoid. Related to bazelbuild#16009. Closes bazelbuild#16010. PiperOrigin-RevId: 503922158 Change-Id: I64392ada951938d612dd0b28141e6b2e4ee6952c
diff --git a/tools/cpp/cc_configure.bzl b/tools/cpp/cc_configure.bzl
@@ -170,6 +170,7 @@ cc_autoconf = repository_rule(
         "CPLUS_INCLUDE_PATH",
         "DEVELOPER_DIR",
         "GCOV",
+        "LIBTOOL",
         "HOMEBREW_RUBY_PATH",
         "SYSTEMROOT",
         "USER",
diff --git a/tools/cpp/unix_cc_configure.bzl b/tools/cpp/unix_cc_configure.bzl
@@ -384,7 +384,7 @@ def configure_unix_toolchain(repository_ctx, cpu_value, overriden_tools):
     )
     if darwin:
         overriden_tools["gcc"] = "cc_wrapper.sh"
-        overriden_tools["ar"] = "/usr/bin/libtool"
+        overriden_tools["ar"] = _find_generic(repository_ctx, "libtool", "LIBTOOL", overriden_tools)
     auto_configure_warning_maybe(repository_ctx, "CC used: " + str(cc))
     tool_paths = _get_tool_paths(repository_ctx, overriden_tools)
     cc_toolchain_identifier = escape_string(get_env_var(

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ def configure_unix_toolchain(repository_ctx, cpu_value, overriden_tools):`
`384`	`384`	`)`
`385`	`385`	`if darwin:`
`386`	`386`	`overriden_tools["gcc"] = "cc_wrapper.sh"`
`387`		`- overriden_tools["ar"] = "/usr/bin/libtool"`
	`387`	`+ overriden_tools["ar"] = _find_generic(repository_ctx, "libtool", "LIBTOOL", overriden_tools)`
`388`	`388`	`auto_configure_warning_maybe(repository_ctx, "CC used: " + str(cc))`
`389`	`389`	`tool_paths = _get_tool_paths(repository_ctx, overriden_tools)`
`390`	`390`	`cc_toolchain_identifier = escape_string(get_env_var(`