Skip to content

Commit

Permalink
Remove wrapped_clang tpl workaround files
Browse files Browse the repository at this point in the history
Per the comment that was here, these shouldn't be needed since there
shouldn't be issues with building wrapped_clang.

Closes bazelbuild#7518.

PiperOrigin-RevId: 235584116
  • Loading branch information
keith authored and copybara-github committed Feb 25, 2019
1 parent 9d40c6b commit 992eb17
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 39 deletions.
22 changes: 3 additions & 19 deletions tools/cpp/osx_cc_configure.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ def configure_osx_toolchain(repository_ctx, overriden_tools):
"@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",
])

Expand Down Expand Up @@ -120,30 +118,16 @@ def configure_osx_toolchain(repository_ctx, overriden_tools):
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(
code = xcrun_result.return_code,
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 = []
Expand Down
10 changes: 0 additions & 10 deletions tools/osx/crosstool/wrapped_clang.tpl

This file was deleted.

10 changes: 0 additions & 10 deletions tools/osx/crosstool/wrapped_clang_pp.tpl

This file was deleted.

0 comments on commit 992eb17

Please sign in to comment.