From 15fc2925e7e45ee2fa562bf996b148a0c19230d6 Mon Sep 17 00:00:00 2001 From: "Ian (Hee) Cha" Date: Thu, 25 May 2023 00:12:44 -0700 Subject: [PATCH] Fix Xcode 14.3 compatibility (#18490) 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 https://github.com/bazelbuild/bazel/issues/18278 Closes #18460. PiperOrigin-RevId: 534743568 Change-Id: I131880096c941df0097fe3b1faabd5a6afada4f3 Co-authored-by: Keith Smiley --- .bazelrc | 2 +- .../devtools/build/lib/rules/apple/AppleCommandLineOptions.java | 2 +- .../devtools/build/lib/rules/apple/XcodeVersionProperties.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bazelrc b/.bazelrc index 20921ea73cf117..dc2e5ceb7d6cd2 100644 --- a/.bazelrc +++ b/.bazelrc @@ -25,7 +25,7 @@ build:ubuntu1804_java11 --config=remote_shared # Alias build:remote --config=ubuntu1804_java11 -build:macos --macos_minimum_os=10.10 +build:macos --macos_minimum_os=10.11 # Enable Bzlmod build:bzlmod --experimental_enable_bzlmod 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 e6d9128f32598c..794df2293f98a1 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 @@ -188,7 +188,7 @@ public class AppleCommandLineOptions extends FragmentOptions { @VisibleForTesting public static final String DEFAULT_IOS_SDK_VERSION = "8.4"; @VisibleForTesting public static final String DEFAULT_WATCHOS_SDK_VERSION = "2.0"; - @VisibleForTesting public static final String DEFAULT_MACOS_SDK_VERSION = "10.10"; + @VisibleForTesting public static final String DEFAULT_MACOS_SDK_VERSION = "10.11"; @VisibleForTesting public static final String DEFAULT_TVOS_SDK_VERSION = "9.0"; @VisibleForTesting static final String DEFAULT_IOS_CPU = "x86_64"; diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionProperties.java b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionProperties.java index d0b15f3c6d6ba5..f3e6e39e175423 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionProperties.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionProperties.java @@ -37,7 +37,7 @@ public class XcodeVersionProperties extends NativeInfo implements XcodePropertie @VisibleForTesting public static final String DEFAULT_IOS_SDK_VERSION = "8.4"; @VisibleForTesting public static final String DEFAULT_WATCHOS_SDK_VERSION = "2.0"; - @VisibleForTesting public static final String DEFAULT_MACOS_SDK_VERSION = "10.10"; + @VisibleForTesting public static final String DEFAULT_MACOS_SDK_VERSION = "10.11"; @VisibleForTesting public static final String DEFAULT_TVOS_SDK_VERSION = "9.0"; private final Optional xcodeVersion;