1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java
index 6672ca93bd..ab010e9396 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java
@@ -23,6 +23,7 @@ import static com.google.devtools.build.lib.syntax.Type.STRING;
 
 import com.google.devtools.build.lib.analysis.BaseRuleClasses;
 import com.google.devtools.build.lib.analysis.MakeVariableInfo;
+import com.google.devtools.build.lib.analysis.PlatformConfiguration;
 import com.google.devtools.build.lib.analysis.RuleDefinition;
 import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -82,10 +83,12 @@ public final class CcToolchainRule implements RuleDefinition {
     }
     return builder
         .setUndocumented()
-        .requiresConfigurationFragments(CppConfiguration.class)
+        .requiresConfigurationFragments(CppConfiguration.class, PlatformConfiguration.class)
         .advertiseProvider(MakeVariableInfo.class)
         .add(attr("output_licenses", LICENSE))
         .add(attr("cpu", STRING).mandatory())
+        .add(attr("compiler", STRING))
+        .add(attr("libc", STRING))
         .add(attr("all_files", LABEL).legacyAllowAnyFileType().cfg(HOST).mandatory())
         .add(attr("compiler_files", LABEL).legacyAllowAnyFileType().cfg(HOST).mandatory())
         .add(attr("strip_files", LABEL).legacyAllowAnyFileType().cfg(HOST).mandatory())
@@ -109,6 +112,9 @@ public final class CcToolchainRule implements RuleDefinition {
                 .singleArtifact()
                 .value(env.getToolsLabel("//tools/cpp:link_dynamic_library")))
         .add(
+            attr(CcToolchain.CC_TOOLCHAIN_TYPE_ATTRIBUTE_NAME, LABEL)
+                .value(CppRuleClasses.ccToolchainTypeAttribute(env)))
+        .add(
             attr(":zipper", LABEL)
                 .cfg(HOST)
                 .singleArtifact()