Map env

bazelbuild · May 24, 2024 · 1a21e7d · 1a21e7d
1 parent 124d3c2
commit 1a21e7d
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
@@ -858,9 +858,14 @@ public ImmutableMap<String, String> getIncompleteEnvironmentForTesting()
     }
   }
 
-  @Override()
+  @Override
   public ImmutableMap<String, String> getEffectiveEnvironment(Map<String, String> clientEnv)
       throws CommandLineExpansionException {
+    return getEffectiveEnvironment(clientEnv, PathMapper.NOOP);
+  }
+
+  public ImmutableMap<String, String> getEffectiveEnvironment(
+      Map<String, String> clientEnv, PathMapper pathMapper) throws CommandLineExpansionException {
     ActionEnvironment env = getEnvironment();
     Map<String, String> environment = Maps.newLinkedHashMapWithExpectedSize(env.estimatedSize());
     env.resolve(environment, clientEnv);
@@ -1567,7 +1572,7 @@ Spawn createSpawn(Path execRoot, Map<String, String> clientEnv, PathMapper pathM
       return new SimpleSpawn(
           this,
           ImmutableList.copyOf(getArguments(pathMapper)),
-          getEffectiveEnvironment(clientEnv),
+          getEffectiveEnvironment(clientEnv, pathMapper),
           executionInfo.buildOrThrow(),
           /* filesetMappings= */ ImmutableMap.of(),
           inputs,