Remove genrule's special handling of the "toolchains" attribute.

The general handling should be fine for this.

PiperOrigin-RevId: 201352916

1 files changed, 1 insertions, 25 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java b/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java
index 4d0f60d26d..49c13c605d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java
@@ -35,7 +35,6 @@ import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.Runfiles;
 import com.google.devtools.build.lib.analysis.RunfilesProvider;
 import com.google.devtools.build.lib.analysis.ShToolchain;
-import com.google.devtools.build.lib.analysis.TemplateVariableInfo;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget.Mode;
 import com.google.devtools.build.lib.analysis.stringtemplate.ExpansionException;
@@ -283,39 +282,25 @@ public abstract class GenRuleBase implements RuleConfiguredTargetFactory {
     private final RuleContext ruleContext;
     private final NestedSet<Artifact> resolvedSrcs;
     private final NestedSet<Artifact> filesToBuild;
-    private final Iterable<TemplateVariableInfo> toolchains;
 
     public CommandResolverContext(
         RuleContext ruleContext,
         NestedSet<Artifact> resolvedSrcs,
         NestedSet<Artifact> filesToBuild) {
       super(
-          ruleContext.getMakeVariables(ImmutableList.of(":cc_toolchain")),
+          ruleContext,
           ruleContext.getRule().getPackage(),
           ruleContext.getConfiguration(),
           ImmutableList.of(new CcFlagsSupplier(ruleContext)));
       this.ruleContext = ruleContext;
       this.resolvedSrcs = resolvedSrcs;
       this.filesToBuild = filesToBuild;
-      this.toolchains = ruleContext.getPrerequisites(
-          "toolchains", Mode.TARGET, TemplateVariableInfo.PROVIDER);
     }
 
     public RuleContext getRuleContext() {
       return ruleContext;
     }
 
-    private String resolveVariableFromToolchains(String variableName) {
-      for (TemplateVariableInfo info : toolchains) {
-        String result = info.getVariables().get(variableName);
-        if (result != null) {
-          return result;
-        }
-      }
-
-      return null;
-    }
-
     @Override
     public String lookupVariable(String variableName) throws ExpansionException {
       if (variableName.equals("SRCS")) {
@@ -363,15 +348,6 @@ public abstract class GenRuleBase implements RuleConfiguredTargetFactory {
         }
       }
 
-      // Make variables provided by the :cc_toolchain attributes should not be overridden by
-      // those provided by the toolchains attribute.
-      if (!CROSSTOOL_MAKE_VARIABLES.contains(variableName)) {
-        String valueFromToolchains = resolveVariableFromToolchains(variableName);
-        if (valueFromToolchains != null) {
-          return valueFromToolchains;
-        }
-      }
-
       return super.lookupVariable(variableName);
     }