Refactor osx cc autoconfiguration to not use a template Starlark cc_toolchain_config rule
RELNOTES: None.
PiperOrigin-RevId: 254941425
diff --git a/tools/cpp/osx_cc_configure.bzl b/tools/cpp/osx_cc_configure.bzl
index 2f6ff00..01b5c08 100644
--- a/tools/cpp/osx_cc_configure.bzl
+++ b/tools/cpp/osx_cc_configure.bzl
@@ -57,7 +57,7 @@
"@bazel_tools//tools/objc:make_hashed_objlist.py",
"@bazel_tools//tools/objc:xcrunwrapper.sh",
"@bazel_tools//tools/osx/crosstool:BUILD.tpl",
- "@bazel_tools//tools/osx/crosstool:cc_toolchain_config.bzl.tpl",
+ "@bazel_tools//tools/osx/crosstool:cc_toolchain_config.bzl",
"@bazel_tools//tools/osx/crosstool:wrapped_ar.tpl",
"@bazel_tools//tools/osx/crosstool:wrapped_clang.cc",
"@bazel_tools//tools/osx:xcode_locator.m",
@@ -102,8 +102,8 @@
"wrapped_ar",
)
repository_ctx.symlink(
- paths["@bazel_tools//tools/osx/crosstool:BUILD.tpl"],
- "BUILD",
+ paths["@bazel_tools//tools/osx/crosstool:cc_toolchain_config.bzl"],
+ "cc_toolchain_config.bzl",
)
wrapped_clang_src_path = str(repository_ctx.path(
paths["@bazel_tools//tools/osx/crosstool:wrapped_clang.cc"],
@@ -136,12 +136,12 @@
escaped_include_paths = _get_escaped_xcode_cxx_inc_directories(repository_ctx, cc, xcode_toolchains)
escaped_cxx_include_directories = []
for path in escaped_include_paths:
- escaped_cxx_include_directories.append((" \"%s\"," % path))
+ escaped_cxx_include_directories.append((" \"%s\"," % path))
if xcodeloc_err:
escaped_cxx_include_directories.append("# Error: " + xcodeloc_err + "\n")
repository_ctx.template(
- "cc_toolchain_config.bzl",
- paths["@bazel_tools//tools/osx/crosstool:cc_toolchain_config.bzl.tpl"],
+ "BUILD",
+ paths["@bazel_tools//tools/osx/crosstool:BUILD.tpl"],
{"%{cxx_builtin_include_directories}": "\n".join(escaped_cxx_include_directories)},
)
else:
