From dfa6368490224a2f98d967736cef5803a82c3989 Mon Sep 17 00:00:00 2001 From: Chris Parsons Date: Tue, 8 Dec 2015 20:24:01 +0000 Subject: Find frameworks in System/ instead of in Developer/ for ios sdks 9.0 and later -- MOS_MIGRATED_REVID=109715685 --- .../com/google/devtools/build/lib/rules/objc/CompilationSupport.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc') 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 40260085e1..b5f134b46f 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 @@ -1306,7 +1306,8 @@ public final class CompilationSupport { ObjcProvider provider, ObjcConfiguration objcConfiguration, AppleConfiguration appleConfiguration) { ImmutableList.Builder builder = new ImmutableList.Builder<>(); - if (Platform.forIosArch(appleConfiguration.getIosCpu()) == Platform.IOS_SIMULATOR) { + Platform platform = Platform.forIosArch(appleConfiguration.getIosCpu()); + if (platform == Platform.IOS_SIMULATOR) { builder.add("-mios-simulator-version-min=" + objcConfiguration.getMinimumOs()); } else { builder.add("-miphoneos-version-min=" + objcConfiguration.getMinimumOs()); @@ -1320,7 +1321,7 @@ public final class CompilationSupport { .add("-arch", appleConfiguration.getIosCpu()) .add("-isysroot", AppleToolchain.sdkDir()) // TODO(bazel-team): Pass framework search paths to Xcodegen. - .add("-F", AppleToolchain.sdkDeveloperFrameworkDir()) + .add("-F", AppleToolchain.sdkFrameworkDir(platform, appleConfiguration)) // As of sdk8.1, XCTest is in a base Framework dir .add("-F", AppleToolchain.platformDeveloperFrameworkDir(appleConfiguration)) // Add custom (non-SDK) framework search paths. For each framework foo/bar.framework, -- cgit v1.2.3