Fix cc_fake_binaries with linkstamping

In https://github.com/bazelbuild/bazel/commit/b7a9ecd08c958e9513ea234b470a0f86e89e1acd I introduced a bug when linkstamping outputs would no longer be
stored in $TEST_TMPDIR. This cl fixes that.

RELNOTES: None.
PiperOrigin-RevId: 169882831

1 files changed, 11 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java
index 186c4f742a..f351742f2a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java
@@ -539,8 +539,17 @@ public final class LinkCommandLine extends CommandLine {
       linkstampCompileCommandLine.add("-c");
       linkstampCompileCommandLine.add(sourceFile.getExecPathString());
       linkstampCompileCommandLine.add("-o");
-      linkstampCompileCommandLine.add(outputFile.getExecPathString());
-      commands.add(ShellEscaper.escapeJoinAll(linkstampCompileCommandLine.build()));
+      // outputPrefix is there only for cc_fake_binary, and it can contain env var expansions
+      // (such as $TEST_TMPDIR) and cannot be escaped. When we move linkstamping to a separate
+      // action, there will no longer be bash around the invocation and therefore no need to do
+      // shell escaping.
+      String escapedCommandWithoutOutput =
+          ShellEscaper.escapeJoinAll(linkstampCompileCommandLine.build());
+      commands.add(
+          escapedCommandWithoutOutput
+              + " "
+              + outputPrefix
+              + ShellEscaper.escapeString(outputFile.getExecPathString()));
     }
 
     return commands;