Don't precompute coverage environment in cc_toolchain

Instead, compute it for each target separately using its rule context. bazelbuild/bazel#6516 RELNOTES: None PiperOrigin-RevId: 240330179
luca-digrazia · Sep 4, 2022 · e8911d8 · e8911d8
1 parent ebdf7d7
commit e8911d8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/...Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/...Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -678,7 +678,8 @@ public Artifact getDynamicLibrarySymlink(Artifact library, boolean preserveName)
         ccToolchain.getSolibDirectory(),
         library,
         preserveName,
-        /* prefixConsumer= */ true);
+        true,
+        ruleContext.getConfiguration());
   }
 
   /**

diff --git a/...uild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java b/...uild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java
@@ -986,9 +986,5 @@ public boolean isHostConfiguration() {
   public LicensesProvider getLicensesProvider() {
     return licensesProvider;
   }
-
-  public PathFragment getDefaultSysroot() {
-    return toolchainInfo.getDefaultSysroot();
-  }
 }
 
diff --git a/...azel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java b/...azel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java
@@ -551,7 +551,11 @@ static CcToolchainProvider getCcToolchainProvider(
           dynamicRuntimeLinkInputs.add(artifact);
           dynamicRuntimeLinkSymlinksBuilder.add(
               SolibSymlinkAction.getCppRuntimeSymlink(
-                  ruleContext, artifact, toolchainInfo.getSolibDirectory(), runtimeSolibDirBase));
+                  ruleContext,
+                  artifact,
+                  toolchainInfo.getSolibDirectory(),
+                  runtimeSolibDirBase,
+                  configuration));
         }
       }
       if (dynamicRuntimeLinkInputs.isEmpty()) {

diff --git a/...ava/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/...ava/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
@@ -625,14 +625,15 @@ private static List<Artifact> getMiddlemanInternal(
         symlinkedArtifacts.add(
             isCppRuntime
                 ? SolibSymlinkAction.getCppRuntimeSymlink(
-                    ruleContext, artifact, solibDir, solibDirOverride)
+                    ruleContext, artifact, solibDir, solibDirOverride, configuration)
                 : SolibSymlinkAction.getDynamicLibrarySymlink(
                     /* actionRegistry= */ ruleContext,
                     /* actionConstructionContext= */ ruleContext,
                     solibDir,
                     artifact,
                     /* preserveName= */ false,
-                    /* prefixConsumer= */ true));
+                    /* prefixConsumer= */ true,
+                    configuration));
       }
       artifacts = symlinkedArtifacts;
       purpose += "_with_solib";