diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/genrule')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java | 16 |
1 files changed, 11 insertions, 5 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 ca50836a59..49372a9c3a 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 @@ -39,7 +39,6 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.packages.TargetUtils; import com.google.devtools.build.lib.rules.AliasProvider; -import com.google.devtools.build.lib.rules.MakeVariableProvider; import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory; import com.google.devtools.build.lib.rules.cpp.CppHelper; import com.google.devtools.build.lib.rules.java.JavaHelper; @@ -290,12 +289,17 @@ public abstract class GenRuleBase implements RuleConfiguredTargetFactory { private final NestedSet<Artifact> resolvedSrcs; private final NestedSet<Artifact> filesToBuild; - public CommandResolverContext(RuleContext ruleContext, NestedSet<Artifact> resolvedSrcs, + private static final ImmutableList<String> makeVariableAttributes = + ImmutableList.of(":cc_toolchain", "toolchains"); + + public CommandResolverContext( + RuleContext ruleContext, + NestedSet<Artifact> resolvedSrcs, NestedSet<Artifact> filesToBuild) { super( + ruleContext.getMakeVariables(makeVariableAttributes), ruleContext.getRule().getPackage(), - ruleContext.getConfiguration(), - MakeVariableProvider.getToolchainMakeVariables(ruleContext, "toolchains")); + ruleContext.getConfiguration()); this.ruleContext = ruleContext; this.resolvedSrcs = resolvedSrcs; this.filesToBuild = filesToBuild; @@ -344,7 +348,9 @@ public abstract class GenRuleBase implements RuleConfiguredTargetFactory { } } else if (JDK_MAKE_VARIABLE.matcher("$(" + name + ")").find()) { return new ConfigurationMakeVariableContext( - ruleContext.getTarget().getPackage(), ruleContext.getHostConfiguration()) + ruleContext.getMakeVariables(makeVariableAttributes), + ruleContext.getTarget().getPackage(), + ruleContext.getHostConfiguration()) .lookupMakeVariable(name); } else { return super.lookupMakeVariable(name); |