1 files changed, 10 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
index d03dda0348..b595600a57 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
@@ -1509,16 +1509,16 @@ public final class CcCompilationHelper {
         ruleContext,
         featureConfiguration,
         ccToolchain,
-        sourceFile,
-        builder.getOutputFile(),
-        gcnoFile,
-        dwoFile,
-        ltoIndexingFile,
+        toPathString(sourceFile),
+        toPathString(builder.getOutputFile()),
+        toPathString(gcnoFile),
+        toPathString(dwoFile),
+        toPathString(ltoIndexingFile),
         ImmutableList.of(),
         userCompileFlags.build(),
         cppModuleMap,
         usePic,
-        builder.getRealOutputFilePath(),
+        builder.getTempOutputFile(),
         CppHelper.getFdoBuildStamp(ruleContext, fdoSupport.getFdoSupport()),
         dotdFileExecPath,
         ImmutableList.copyOf(variablesExtensions),
@@ -1530,6 +1530,10 @@ public final class CcCompilationHelper {
         ccCompilationContext.getDefines());
   }
 
+  private static String toPathString(Artifact a) {
+    return a == null ? null : a.getExecPathString();
+  }
+
   /**
    * Returns a {@code CppCompileActionBuilder} with the common fields for a C++ compile action being
    * initialized.