Build wrapped_clang and wrapped_clang_pp in action

This compiles wrapped_clang and wrapped_clang_pp inside of an action.
bazelbuild#8902 has a larger definition
of the issue.

This action needs the DEVELOPER_DIR as an input in order to select the
correct clang. This is passed in from apple_common.XcodeVersionConfig.

Note that this works for local execution and needs to address the TODO
for cc_wrapper.sh in tools/cpp/osx_cc_configure.bzl.

Author: jerrymarino

tools/cpp/osx_cc_configure.bzl

@@ -53,35 +53,6 @@ def _get_escaped_xcode_cxx_inc_directories(repository_ctx, cc, xcode_toolchains)
 
     return include_dirs
 
-def _compile_cc_file(repository_ctx, src_name, out_name):
-    env = repository_ctx.os.environ
-    xcrun_result = repository_ctx.execute([
-        "env",
-        "-i",
-        "DEVELOPER_DIR={}".format(env.get("DEVELOPER_DIR", default = "")),
-        "xcrun",
-        "--sdk",
-        "macosx",
-        "clang",
-        "-mmacosx-version-min=10.9",
-        "-std=c++11",
-        "-lc++",
-        "-O3",
-        "-o",
-        out_name,
-        src_name,
-    ], 30)
-    if (xcrun_result.return_code != 0):
-        error_msg = (
-            "return code {code}, stderr: {err}, stdout: {out}"
-        ).format(
-            code = xcrun_result.return_code,
-            err = xcrun_result.stderr,
-            out = xcrun_result.stdout,
-        )
-        fail(out_name + " failed to generate. Please file an issue at " +
-             "https://github.com/bazelbuild/bazel/issues with the following:\n" +
-             error_msg)
 
 def configure_osx_toolchain(repository_ctx, overriden_tools):
     """Configure C++ toolchain on macOS.
@@ -121,6 +92,10 @@ def configure_osx_toolchain(repository_ctx, overriden_tools):
         # cc_wrapper.sh script. The wrapped_clang binary is already hardcoded
         # into the Objective-C crosstool actions, anyway, so this ensures that
         # the C++ actions behave consistently.
+
+        # Consider building cc_wrapper.sh an in action with a dep on
+        # wrapped_clang
+        # e.g. bazel-out/host/bin/external/local_config_cc/wrapped_clang
         cc = repository_ctx.path("wrapped_clang")
 
         cc_path = '"$(/usr/bin/dirname "$0")"/wrapped_clang'
@@ -151,13 +126,6 @@ def configure_osx_toolchain(repository_ctx, overriden_tools):
         libtool_check_unique_src_path = str(repository_ctx.path(
             paths["@bazel_tools//tools/objc:libtool_check_unique.cc"],
         ))
-        _compile_cc_file(repository_ctx, libtool_check_unique_src_path, "libtool_check_unique")
-        wrapped_clang_src_path = str(repository_ctx.path(
-            paths["@bazel_tools//tools/osx/crosstool:wrapped_clang.cc"],
-        ))
-        _compile_cc_file(repository_ctx, wrapped_clang_src_path, "wrapped_clang")
-        repository_ctx.symlink("wrapped_clang", "wrapped_clang_pp")
-
         tool_paths = {}
         gcov_path = repository_ctx.os.environ.get("GCOV")
         if gcov_path != None:

tools/osx/crosstool/BUILD.tpl

@@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
 
 load("@local_config_cc_toolchains//:osx_archs.bzl", "OSX_TOOLS_ARCHS")
 load("@rules_cc//cc:defs.bzl", "cc_toolchain_suite", "cc_library")
-load(":cc_toolchain_config.bzl", "cc_toolchain_config")
+load(":cc_toolchain_config.bzl", "cc_toolchain_config", "toolchain_binary")
 
 # Reexporting osx_arch.bzl for backwards compatibility
 # Originally this file was present in @local_config_cc, but with the split in
@@ -11,6 +11,9 @@ load(":cc_toolchain_config.bzl", "cc_toolchain_config")
 # compatible (and serves no other purpose).
 alias(name = "osx_archs.bzl", actual = "@local_config_cc_toolchains//:osx_archs.bzl")
 
+toolchain_binary(name="wrapped_clang", src="@bazel_tools//tools/osx/crosstool:wrapped_clang.cc")
+toolchain_binary(name="wrapped_clang_pp", src="@bazel_tools//tools/osx/crosstool:wrapped_clang.cc")
+
 CC_TOOLCHAINS = [(
     cpu + "|compiler",
     ":cc-compiler-" + cpu,
@@ -85,6 +88,8 @@ cc_toolchain_suite(
     cc_toolchain_config(
         name = (arch if arch != "armeabi-v7a" else "stub_armeabi-v7a"),
         compiler = "compiler",
+        wrapped_clang = ":wrapped_clang",
+        wrapped_clang = ":wrapped_clang_pp",
         cpu = arch,
         cxx_builtin_include_directories = [
 %{cxx_builtin_include_directories}