From 39cca1242d43ee35dcbc5563098e8bcd44836382 Mon Sep 17 00:00:00 2001 From: hlopko Date: Thu, 13 Sep 2018 04:25:28 -0700 Subject: [PATCH] Make cc_toolchain.cpu and cc_toolchain.compiler nonconfigurable They should be used during toolchain selection (will happen in unknown commit). I think it's an oversight that they are configurable now. #6072 RELNOTES: None PiperOrigin-RevId: 212791669 --- .../google/devtools/build/lib/rules/cpp/CcToolchainRule.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 be04a2d8b73d74..fc74002be84eee 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 @@ -109,8 +109,8 @@ public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) .requiresConfigurationFragments(CppConfiguration.class, PlatformConfiguration.class) .advertiseProvider(TemplateVariableInfo.class) .add(attr("output_licenses", LICENSE)) - .add(attr("cpu", STRING).mandatory()) - .add(attr("compiler", STRING)) + .add(attr("cpu", STRING).nonconfigurable("Used in configuration creation").mandatory()) + .add(attr("compiler", STRING).nonconfigurable("Used in configuration creation")) .add( attr("all_files", LABEL) .legacyAllowAnyFileType()