Rename thinlto_param_file to thinlto_indexing_param_file for indexing actions

My assumption in commit 4cb32a994308e1b4921471e32a02c49d8ceffb84 was that lto-indexing action doesn't expand
linking features. This was wrong, and lto-indexing was broken since then as
-Wl,@thinlto_param_file was added to the command line.

This cl changes the situation by actually exposing 2 different build variables,
thinlto_indexing_param_file for lto-indexing actions, and thinlto_param_file
for normal linking actions.

--
PiperOrigin-RevId: 145669124
MOS_MIGRATED_REVID=145669124

1 files changed, 7 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
index e0a9929138..f99191da6b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
@@ -86,6 +86,11 @@ public class CppLinkActionBuilder {
    */
   public static final String THINLTO_PARAM_FILE_VARIABLE = "thinlto_param_file";
 
+  /**
+   * A build variable to let thinlto know where it should write linker flags when indexing.
+   */
+  public static final String THINLTO_INDEXING_PARAM_FILE_VARIABLE = "thinlto_indexing_param_file";
+
   public static final String THINLTO_PREFIX_REPLACE_VARIABLE = "thinlto_prefix_replace";
 
   /**
@@ -1349,12 +1354,12 @@ public class CppLinkActionBuilder {
         if (thinltoParamFile != null) {
           // This is a lto-indexing action and we want it to populate param file.
           buildVariables.addStringVariable(
-              THINLTO_PARAM_FILE_VARIABLE, thinltoParamFile.getExecPathString());
+              THINLTO_INDEXING_PARAM_FILE_VARIABLE, thinltoParamFile.getExecPathString());
           // TODO(b/33846234): Remove once all the relevant crosstools don't depend on the variable.
           buildVariables.addStringVariable(
               "thinlto_optional_params_file", "=" + thinltoParamFile.getExecPathString());
         } else {
-          buildVariables.addStringVariable(THINLTO_PARAM_FILE_VARIABLE, "");
+          buildVariables.addStringVariable(THINLTO_INDEXING_PARAM_FILE_VARIABLE, "");
           // TODO(b/33846234): Remove once all the relevant crosstools don't depend on the variable.
           buildVariables.addStringVariable("thinlto_optional_params_file", "");
         }