Skip to content

Commit 86ef4f4

Browse files
keithcopybara-github
authored andcommitted
Fix Xcode 14.3 compatibility
With Xcode 14.3+ on x86_64 machines there is an opaque error when linking binaries on macOS because Apple removed an old support library. That library is only linked if the macOS target is < 10.11, so this bumps the default versions past that. This macOS version was released in September 2015. Fixes #18278 Closes #18460. PiperOrigin-RevId: 534743568 Change-Id: I131880096c941df0097fe3b1faabd5a6afada4f3
1 parent 85047b8 commit 86ef4f4

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ build:ubuntu1804_java11 --config=remote_shared
2525
# Alias
2626
build:remote --config=ubuntu1804_java11
2727

28-
build:macos --macos_minimum_os=10.10
28+
build:macos --macos_minimum_os=10.11
2929

3030
# Enable Bzlmod
3131
build:bzlmod --enable_bzlmod

src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public class AppleCommandLineOptions extends FragmentOptions {
183183

184184
@VisibleForTesting public static final String DEFAULT_IOS_SDK_VERSION = "8.4";
185185
@VisibleForTesting public static final String DEFAULT_WATCHOS_SDK_VERSION = "2.0";
186-
@VisibleForTesting public static final String DEFAULT_MACOS_SDK_VERSION = "10.10";
186+
@VisibleForTesting public static final String DEFAULT_MACOS_SDK_VERSION = "10.11";
187187
@VisibleForTesting public static final String DEFAULT_TVOS_SDK_VERSION = "9.0";
188188
@VisibleForTesting static final String DEFAULT_IOS_CPU = "x86_64";
189189

src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class XcodeVersionProperties extends NativeInfo implements XcodePropertie
3737

3838
@VisibleForTesting public static final String DEFAULT_IOS_SDK_VERSION = "8.4";
3939
@VisibleForTesting public static final String DEFAULT_WATCHOS_SDK_VERSION = "2.0";
40-
@VisibleForTesting public static final String DEFAULT_MACOS_SDK_VERSION = "10.10";
40+
@VisibleForTesting public static final String DEFAULT_MACOS_SDK_VERSION = "10.11";
4141
@VisibleForTesting public static final String DEFAULT_TVOS_SDK_VERSION = "9.0";
4242

4343
private final Optional<DottedVersion> xcodeVersion;

0 commit comments

Comments
 (0)