1 files changed, 5 insertions, 0 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 f6b6052895..ed95544092 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
@@ -223,6 +223,8 @@ public class CompilationSupport {
 
   private static final String GENERATE_LINKMAP_FEATURE_NAME = "generate_linkmap";
 
+  private static final String XCODE_VERSION_FEATURE_NAME_PREFIX = "xcode_";
+
   /** Enabled if this target has objc sources in its transitive closure. */
   private static final String CONTAINS_OBJC = "contains_objc_sources";
 
@@ -545,6 +547,9 @@ public class CompilationSupport {
       activatedCrosstoolSelectables.add(CppRuleClasses.PER_OBJECT_DEBUG_INFO);
     }
 
+    activatedCrosstoolSelectables.add(XCODE_VERSION_FEATURE_NAME_PREFIX
+        + XcodeConfig.getXcodeVersion(ruleContext).toStringWithMinimumComponents(2));
+
     activatedCrosstoolSelectables.addAll(ruleContext.getFeatures());
 
     activatedCrosstoolSelectables.addAll(CcCommon.getCoverageFeatures(toolchain));