Remove wrapped_clang tpl workaround files
Per the comment that was here, these shouldn't be needed since there
shouldn't be issues with building wrapped_clang.
Closes #7518.
PiperOrigin-RevId: 235584116
diff --git a/tools/cpp/osx_cc_configure.bzl b/tools/cpp/osx_cc_configure.bzl
index fca2434..e12ff89 100644
--- a/tools/cpp/osx_cc_configure.bzl
+++ b/tools/cpp/osx_cc_configure.bzl
@@ -58,8 +58,6 @@
"@bazel_tools//tools/osx/crosstool:osx_archs.bzl",
"@bazel_tools//tools/osx/crosstool:wrapped_ar.tpl",
"@bazel_tools//tools/osx/crosstool:wrapped_clang.cc",
- "@bazel_tools//tools/osx/crosstool:wrapped_clang.tpl",
- "@bazel_tools//tools/osx/crosstool:wrapped_clang_pp.tpl",
"@bazel_tools//tools/osx:xcode_locator.m",
])
@@ -120,11 +118,6 @@
if (xcrun_result.return_code == 0):
repository_ctx.symlink("wrapped_clang", "wrapped_clang_pp")
else:
- # If for some reason wrapped_clang couldn't be built, fall back to
- # using the bash scripts that don't support dSYM generation. This is to
- # avoid completely breaking a build. This should be removed after a whole
- # release cycle to keep from increasing code maintenance, if we haven't
- # received any issues as requested below.
error_msg = (
"return code {code}, stderr: {err}, stdout: {out}"
).format(
@@ -132,18 +125,9 @@
err = xcrun_result.stderr,
out = xcrun_result.stdout,
)
- print("wrapped_clang failed to generate. This shouldn't cause " +
- "problems, but please file an issue at " +
- "https://github.com/bazelbuild/bazel/issues with the following:\n" +
- error_msg)
- repository_ctx.symlink(
- paths["@bazel_tools//tools/osx/crosstool:wrapped_clang.tpl"],
- "wrapped_clang",
- )
- repository_ctx.symlink(
- paths["@bazel_tools//tools/osx/crosstool:wrapped_clang_pp.tpl"],
- "wrapped_clang_pp",
- )
+ fail("wrapped_clang failed to generate. Please file an issue at " +
+ "https://github.com/bazelbuild/bazel/issues with the following:\n" +
+ error_msg)
escaped_include_paths = _get_escaped_xcode_cxx_inc_directories(repository_ctx, cc, xcode_toolchains)
escaped_cxx_include_directories = []
diff --git a/tools/osx/crosstool/wrapped_clang.tpl b/tools/osx/crosstool/wrapped_clang.tpl
deleted file mode 100644
index 3a523d2..0000000
--- a/tools/osx/crosstool/wrapped_clang.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-# A trick to allow invoking this script in multiple contexts.
-if [ -z ${MY_LOCATION+x} ]; then
- if [ -d "$0.runfiles/" ]; then
- MY_LOCATION="$0.runfiles/bazel_tools/tools/objc"
- else
- MY_LOCATION="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
- fi
-fi
-
-"${MY_LOCATION}"/xcrunwrapper.sh clang $@
diff --git a/tools/osx/crosstool/wrapped_clang_pp.tpl b/tools/osx/crosstool/wrapped_clang_pp.tpl
deleted file mode 100644
index 4afc7b0..0000000
--- a/tools/osx/crosstool/wrapped_clang_pp.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-# A trick to allow invoking this script in multiple contexts.
-if [ -z ${MY_LOCATION+x} ]; then
- if [ -d "$0.runfiles/" ]; then
- MY_LOCATION="$0.runfiles/bazel_tools/tools/objc"
- else
- MY_LOCATION="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
- fi
-fi
-
-"${MY_LOCATION}"/xcrunwrapper.sh clang++ $@
