1 files changed, 9 insertions, 8 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 39ed3e564c..7e49b8eea3 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
@@ -69,6 +69,7 @@ import com.google.devtools.build.lib.rules.apple.AppleConfiguration;
 import com.google.devtools.build.lib.rules.apple.ApplePlatform;
 import com.google.devtools.build.lib.rules.apple.ApplePlatform.PlatformType;
 import com.google.devtools.build.lib.rules.apple.AppleToolchain;
+import com.google.devtools.build.lib.rules.apple.XcodeConfig;
 import com.google.devtools.build.lib.rules.cpp.CcToolchain;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainProvider;
 import com.google.devtools.build.lib.rules.cpp.CppFileTypes;
@@ -264,18 +265,19 @@ public abstract class CompilationSupport {
 
   /** Returns a list of framework search path flags for clang actions. */
   static Iterable<String> commonFrameworkFlags(
-      ObjcProvider provider, AppleConfiguration appleConfiguration) {
-    return Interspersing.beforeEach("-F", commonFrameworkNames(provider, appleConfiguration));
+      ObjcProvider provider, RuleContext ruleContext) {
+    return Interspersing.beforeEach("-F", commonFrameworkNames(provider, ruleContext));
   }
 
   /** Returns a list of frameworks for clang actions. */
   static Iterable<String> commonFrameworkNames(
-      ObjcProvider provider, AppleConfiguration appleConfiguration) {
+      ObjcProvider provider, RuleContext ruleContext) {
+    AppleConfiguration appleConfiguration = ruleContext.getFragment(AppleConfiguration.class);
     ApplePlatform platform = appleConfiguration.getSingleArchPlatform();
 
     ImmutableList.Builder<String> frameworkNames =
         new ImmutableList.Builder<String>()
-            .add(AppleToolchain.sdkFrameworkDir(platform, appleConfiguration));
+            .add(AppleToolchain.sdkFrameworkDir(platform, ruleContext));
     if (platform.getType() == PlatformType.IOS) {
       // As of sdk8.1, XCTest is in a base Framework dir
       frameworkNames.add(AppleToolchain.platformDeveloperFrameworkDir(appleConfiguration));
@@ -1413,12 +1415,11 @@ public abstract class CompilationSupport {
             .add("--platform")
             .add(appleConfiguration.getSingleArchPlatform().getLowerCaseNameInPlist())
             .add("--sdk_version")
-            .add(
-                appleConfiguration
-                    .getSdkVersionForPlatform(appleConfiguration.getSingleArchPlatform())
+            .add(XcodeConfig.getSdkVersionForPlatform(
+                ruleContext, appleConfiguration.getSingleArchPlatform())
                     .toStringWithMinimumComponents(2))
             .add("--xcode_version")
-            .add(appleConfiguration.getXcodeVersion().toStringWithMinimumComponents(2))
+            .add(XcodeConfig.getXcodeVersion(ruleContext).toStringWithMinimumComponents(2))
             .add("--");
     for (ObjcHeaderThinningInfo info : infos) {
       cmdLine.addJoinPaths(