diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java index 65b5e1d63f..d789bc0b84 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java @@ -389,7 +389,7 @@ public class CompilationSupport { boolean isHost = ruleContext.getConfiguration().isHostConfiguration(); ImmutableSet.Builder<String> activatedCrosstoolSelectables = ImmutableSet.<String>builder() - .addAll(ccToolchain.getFeatures().getDefaultFeatures()) + .addAll(ccToolchain.getFeatures().getDefaultFeaturesAndActionConfigs()) .addAll(ACTIVATED_ACTIONS) .addAll( ruleContext @@ -442,7 +442,7 @@ public class CompilationSupport { activatedCrosstoolSelectables.addAll(ruleContext.getFeatures()); try { - return toolchain + return ccToolchain .getFeatures() .getFeatureConfiguration( FeatureSpecification.create( |