Reconcile cc and objc default compiler flags in the crosstool.

--
MOS_MIGRATED_REVID=122035585

1 files changed, 6 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java
index aef4f2795f..e3ec44eaa5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java
@@ -38,6 +38,8 @@ import java.util.Collection;
 public class ExperimentalObjcLibrary implements RuleConfiguredTargetFactory {
 
   private static final String PCH_FILE_VARIABLE_NAME = "pch_file";
+  private static final Iterable<String> ACTIVATED_ACTIONS =
+      ImmutableList.of("objc-compile", "objc++-compile");
   
   private VariablesExtension variablesExtension(final RuleContext ruleContext) {
     return new VariablesExtension() {
@@ -66,13 +68,14 @@ public class ExperimentalObjcLibrary implements RuleConfiguredTargetFactory {
             .getPrerequisite(":cc_toolchain", Mode.TARGET)
             .getProvider(CcToolchainProvider.class);
 
-    ImmutableList.Builder<String> extraFeatures = ImmutableList.builder();
+    ImmutableList.Builder<String> activatedCrosstoolSelectables =
+        ImmutableList.<String>builder().addAll(ACTIVATED_ACTIONS);
     if (ruleContext.getPrerequisiteArtifact("pch", Mode.TARGET) != null) {
-      extraFeatures.add("pch");
+      activatedCrosstoolSelectables.add("pch");
     }
 
     FeatureConfiguration featureConfiguration =
-        toolchain.getFeatures().getFeatureConfiguration(extraFeatures.build());
+        toolchain.getFeatures().getFeatureConfiguration(activatedCrosstoolSelectables.build());
    
     
     Collection<Artifact> sources = Sets.newHashSet(compilationArtifacts.getSrcs());