Make CcToolchainProvider subclass ToolchainInfo. This is required for use of CcToolchainProvider as a "toolchain" in platform-based toolchain resolution.

PiperOrigin-RevId: 165185303

1 files changed, 3 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuite.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuite.java
index 7e20501907..fd9db56cbb 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuite.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSuite.java
@@ -20,6 +20,7 @@ import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.RunfilesProvider;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
+import com.google.devtools.build.lib.analysis.platform.ToolchainInfo;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 
 /**
@@ -36,7 +37,8 @@ public class CcToolchainSuite implements RuleConfiguredTargetFactory {
       throws InterruptedException, RuleErrorException {
     NestedSetBuilder<Artifact> filesToBuild = NestedSetBuilder.stableOrder();
     for (TransitiveInfoCollection dep : ruleContext.getPrerequisiteMap("toolchains").values()) {
-      CcToolchainProvider provider = dep.get(CcToolchainProvider.SKYLARK_CONSTRUCTOR);
+      CcToolchainProvider provider =
+          (CcToolchainProvider) dep.get(ToolchainInfo.SKYLARK_CONSTRUCTOR);
       if (provider != null) {
         filesToBuild.addTransitive(provider.getCrosstool());
       }