diff options
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java | 3 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/AppleCrosstoolTransition.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java index 7438c3a52f..e79688092e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java @@ -38,6 +38,7 @@ public class AppleCommandLineOptions extends FragmentOptions { @VisibleForTesting public static final String DEFAULT_MINIMUM_IOS = "7.0"; + public static final String DEFAULT_MINIMUM_MACOS = "10.10"; @Option( name = "xcode_version", @@ -117,7 +118,7 @@ public class AppleCommandLineOptions extends FragmentOptions { @Option( name = "macos_minimum_os", - defaultValue = "null", + defaultValue = DEFAULT_MINIMUM_MACOS, category = "flags", converter = DottedVersionConverter.class, help = "Minimum compatible macOS version for targets." diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleCrosstoolTransition.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleCrosstoolTransition.java index 59cf36aa98..2c3ed33245 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleCrosstoolTransition.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleCrosstoolTransition.java @@ -19,6 +19,7 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.analysis.config.PatchTransition; import com.google.devtools.build.lib.rules.apple.AppleCommandLineOptions; +import com.google.devtools.build.lib.rules.apple.Platform; import com.google.devtools.build.lib.rules.cpp.CppOptions; import com.google.devtools.build.lib.rules.objc.ObjcCommandLineOptions.ObjcCrosstoolMode; @@ -48,10 +49,9 @@ public class AppleCrosstoolTransition implements PatchTransition { // TODO(b/29355778): Once ios_cpu is retired, introduce another top-level flag (perhaps // --apple_cpu) for toolchain selection in top-level consuming rules. - String cpu = String.format("%s_%s", + String cpu = Platform.cpuStringForTarget( buildOptions.get(AppleCommandLineOptions.class).applePlatformType, buildOptions.get(AppleCommandLineOptions.class).getSingleArchitecture()); - setAppleCrosstoolTransitionConfiguration(buildOptions, result, cpu); return result; } |