diff options
| author |  rduan <rduan@google.com> | 2017-06-29 20:46:21 +0200 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-06-30 13:00:27 +0200 |
| commit | cae82e617422da5cd61e95a249f4fd44a2d3b0de (patch) | |
| tree | 5ae0591214bd8db341d58a111c1ac702176a4bd2 /src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java | |
| parent | db54a93c6bd4d571177b13604e9e87028f158f78 (diff) | |
Pick up default crosstool features in objc.
RELNOTES: None.
PiperOrigin-RevId: 160553181
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java index 2ae34b164a..915d40d76a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java @@ -241,7 +241,8 @@ public class CrosstoolCompilationSupport extends CompilationSupport { .setLinkStaticness(LinkStaticness.FULLY_STATIC) .setLibraryIdentifier(libraryIdentifier) .addVariablesExtension(extension) - .setFeatureConfiguration(getFeatureConfiguration(ruleContext, buildConfiguration)) + .setFeatureConfiguration( + getFeatureConfiguration(ruleContext, ccToolchain, buildConfiguration)) .build(); ruleContext.registerAction(fullyLinkAction); @@ -318,7 +319,8 @@ public class CrosstoolCompilationSupport extends CompilationSupport { .setLinkType(linkType) .setLinkStaticness(LinkStaticness.FULLY_STATIC) .addLinkopts(ImmutableList.copyOf(extraLinkArgs)) - .setFeatureConfiguration(getFeatureConfiguration(ruleContext, buildConfiguration)); + .setFeatureConfiguration( + getFeatureConfiguration(ruleContext, toolchain, buildConfiguration)); if (objcConfiguration.generateDsym()) { Artifact dsymBundleZip = intermediateArtifacts.tempDsymBundleZip(dsymOutputType); @@ -402,7 +404,7 @@ public class CrosstoolCompilationSupport extends CompilationSupport { new CcLibraryHelper( ruleContext, semantics, - getFeatureConfiguration(ruleContext, buildConfiguration), + getFeatureConfiguration(ruleContext, ccToolchain, buildConfiguration), CcLibraryHelper.SourceCategory.CC_AND_OBJC, ccToolchain, fdoSupport, @@ -439,10 +441,11 @@ public class CrosstoolCompilationSupport extends CompilationSupport { } private FeatureConfiguration getFeatureConfiguration(RuleContext ruleContext, - BuildConfiguration configuration) { + CcToolchainProvider ccToolchain, BuildConfiguration configuration) { boolean isHost = ruleContext.getConfiguration().isHostConfiguration(); ImmutableSet.Builder<String> activatedCrosstoolSelectables = ImmutableSet.<String>builder() + .addAll(ccToolchain.getFeatures().getDefaultFeatures()) .addAll(ACTIVATED_ACTIONS) .addAll( ruleContext |