commit c76c3e539c73ecf6e96e3e098be7be59e17bf276
author Keith Smiley <keithbsmiley@gmail.com> Tue Nov 12 07:10:35 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Nov 12 07:11:25 2019 -0800
tree 3a58f3c5c862e18442a76e307c43c286ce7c31af
parent 8e7c3494831edba5fef8a29d200d3b63fc282e46

Replace macOS CC path with relative path

After this change https://github.com/bazelbuild/bazel/pull/8495 the path
to CC embedded in this file was absolute, which caused cache misses for
all compile actions. This change depends on this file relative to the
cc_wrapper itself instead.

Fixes https://github.com/bazelbuild/bazel/issues/10184

Closes #10185.

PiperOrigin-RevId: 279960066

tools/cpp/osx_cc_configure.bzl

diff --git a/tools/cpp/osx_cc_configure.bzl b/tools/cpp/osx_cc_configure.bzl
index 5fab306..711b311 100644
--- a/tools/cpp/osx_cc_configure.bzl
+++ b/tools/cpp/osx_cc_configure.bzl
@@ -83,11 +83,12 @@
         # the C++ actions behave consistently.
         cc = repository_ctx.path("wrapped_clang")
 
+        cc_path = '"$(dirname "$0")"/wrapped_clang'
         repository_ctx.template(
             "cc_wrapper.sh",
             paths["@bazel_tools//tools/cpp:osx_cc_wrapper.sh.tpl"],
             {
-                "%{cc}": escape_string(str(cc)),
+                "%{cc}": escape_string(cc_path),
                 "%{env}": escape_string(get_env(repository_ctx)),
             },
         )