Bug 1871894 - Switch builds to macOS 14.2 SDK. r=spohl,firefox-build-…

…system-reviewers,ahochheiden Differential Revision: https://phabricator.services.mozilla.com/D197280
dothq · Dec 27, 2023 · 2f22100 · 2f22100
1 parent c34b8cd
commit 2f22100
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 32 deletions.
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
@@ -96,7 +96,7 @@ with only_when(host_is_osx | target_is_osx):
         return Version(obj["Version"])
 
     def sdk_min_version():
-        return "14.0"
+        return "14.2"
 
     @depends(
         "--with-macos-sdk",

diff --git a/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist b/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
         <key>Version</key>
-        <string>14.0</string>
+        <string>14.2</string>
 </dict>
 </plist>
diff --git a/taskcluster/ci/toolchain/macos-sdk.yml b/taskcluster/ci/toolchain/macos-sdk.yml
@@ -31,10 +31,10 @@ macosx64-sdk-13.3:
         toolchain-alias:
             - MacOSX13.3.sdk
 
-macosx64-sdk-14.0:
-    description: "MacOSX14.0 SDK"
+macosx64-sdk-14.2:
+    description: "MacOSX14.2 SDK"
     treeherder:
-        symbol: TM(sdk14.0)
+        symbol: TM(sdk14.2)
     # Because it's using an internal tooltool artifact, it can't be used as a local-toolchain for
     # bootstrap. But we still want to use the same script as local-toolchains.
     attributes:
@@ -43,25 +43,24 @@ macosx64-sdk-14.0:
         script: private_local_toolchain.sh
         arguments:
             - unpack-sdk.py
-            - http://taskcluster/tooltool.mozilla-releng.net/sha512/2fd9c9ae202ca961985b32deb1adcb07602361e0cc13a71e5e31726d70ef8f5b1828fdce3ddfaa20eac0b290bcff9a7adc806c2d63c47819a772f1918a372756
-            - 59f13dc8b765e85205934abd4b2b2f694761dbb003d337d9eeb312c1ae706aaa
-            - Library/Developer/CommandLineTools/SDKs/MacOSX14.0.sdk
-        toolchain-artifact: project/gecko/mac-sdk/MacOSX14.0.sdk.tar.zst
+            - http://taskcluster/tooltool.mozilla-releng.net/sha512/22ce0acc9ab5c28845218b8c686d0208d6bf66bef64a369d3c0622247ba1258b438c9e44c64bb2bacf5e99eb398a6e7a337f2730cd4a969a7f0d2d5d3107306a
+            - 3765eade716c472a521e5b982e6932cdc6ba79df3fed4e765d0536039340b730
+            - Library/Developer/CommandLineTools/SDKs/MacOSX14.2.sdk
+        toolchain-artifact: project/gecko/mac-sdk/MacOSX14.2.sdk.tar.zst
         toolchain-alias:
             - macosx64-sdk
             - macosx64-sdk-toolchain
         tooltool-downloads: internal
 
-# Closest publically available to macosx64-sdk-14.0 for local builds.
-macosx64-sdk-14.0-beta:
-    description: "MacOSX14.0 SDK"
+macosx64-sdk-14.2-public:
+    description: "MacOSX14.2 SDK"
     treeherder:
-        symbol: TM(sdk14.0beta)
+        symbol: TM(sdk14.2pub)
     run:
         arguments:
-            - https://swcdn.apple.com/content/downloads/11/17/042-32697-A_1GOTVNQE4A/hy88qtn1sygbgxswlmbfdepd4pcg52xyrx/CLTools_macOSNMOS_SDK.pkg
-            - fa3eb19eceab6d27a3ff55860f6e7753bec8193845d03787fce9735e7efb7dc9
-            - Library/Developer/CommandLineTools/SDKs/MacOSX14.0.sdk
-        toolchain-artifact: project/gecko/mac-sdk/MacOSX14.0.sdk.tar.zst
+            - https://swcdn.apple.com/content/downloads/35/47/042-23550-A_M34N50O9N3/sua6ev7bjcexvorh4709vsgk64zgvsl42p/CLTools_macOSNMOS_SDK.pkg
+            - 3765eade716c472a521e5b982e6932cdc6ba79df3fed4e765d0536039340b730
+            - Library/Developer/CommandLineTools/SDKs/MacOSX14.2.sdk
+        toolchain-artifact: project/gecko/mac-sdk/MacOSX14.2.sdk.tar.zst
         toolchain-alias:
-            - MacOSX14.0.sdk
+            - MacOSX14.2.sdk
diff --git a/taskcluster/ci/toolchain/misc.yml b/taskcluster/ci/toolchain/misc.yml
@@ -227,7 +227,7 @@ macosx64-custom-car:
         toolchain-artifact: public/build/car_macosx.tar.zst
     fetches:
         toolchain:
-            - macosx64-sdk-14.0
+            - macosx64-sdk-14.2
             - macosx64-python-3.8
 
 macosx-arm64-custom-car:
@@ -260,7 +260,7 @@ macosx-arm64-custom-car:
         toolchain-artifact: public/build/car_macosx_arm.tar.zst
     fetches:
         toolchain:
-            - macosx64-sdk-14.0
+            - macosx64-sdk-14.2
             - macosx64-python-3.8
 
 android-custom-car:

diff --git a/taskcluster/scripts/misc/build-custom-car.sh b/taskcluster/scripts/misc/build-custom-car.sh
@@ -55,7 +55,7 @@ fi
 # Logic for macosx64
 if [[ $(uname -s) == "Darwin" ]]; then
   # Modify the config with fetched sdk path
-  export MACOS_SYSROOT="$MOZ_FETCHES_DIR/MacOSX14.0.sdk"
+  export MACOS_SYSROOT="$MOZ_FETCHES_DIR/MacOSX14.2.sdk"
 
   # Use the fetched toolchain python instead as it is a higher version
   # than the system python

diff --git a/taskcluster/scripts/misc/build-gn-macosx.sh b/taskcluster/scripts/misc/build-gn-macosx.sh
@@ -5,7 +5,7 @@ set -e -v
 
 WORKSPACE=$HOME/workspace
 
-CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX14.0.sdk
+CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX14.2.sdk
 export MACOSX_DEPLOYMENT_TARGET=10.12
 
 export CC=$MOZ_FETCHES_DIR/clang/bin/clang

diff --git a/taskcluster/scripts/misc/build-llvm-common.sh b/taskcluster/scripts/misc/build-llvm-common.sh
@@ -39,11 +39,11 @@ case "$target" in
     -DCMAKE_LIPO=$MOZ_FETCHES_DIR/clang/bin/llvm-lipo
     -DCMAKE_SYSTEM_NAME=Darwin
     -DCMAKE_SYSTEM_VERSION=$MACOSX_DEPLOYMENT_TARGET
-    -DCMAKE_OSX_SYSROOT=$MOZ_FETCHES_DIR/MacOSX14.0.sdk
+    -DCMAKE_OSX_SYSROOT=$MOZ_FETCHES_DIR/MacOSX14.2.sdk
     -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld
     -DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=lld
     -DDARWIN_osx_ARCHS=$arch
-    -DDARWIN_osx_SYSROOT=$MOZ_FETCHES_DIR/MacOSX14.0.sdk
+    -DDARWIN_osx_SYSROOT=$MOZ_FETCHES_DIR/MacOSX14.2.sdk
     -DDARWIN_macosx_OVERRIDE_SDK_VERSION=11.0
     -DDARWIN_osx_BUILTIN_ARCHS=$arch
     -DLLVM_DEFAULT_TARGET_TRIPLE=$target

diff --git a/taskcluster/scripts/misc/build-nasm.sh b/taskcluster/scripts/misc/build-nasm.sh
@@ -38,13 +38,13 @@ case "$1" in
     macosx64)
         export MACOSX_DEPLOYMENT_TARGET=10.12
         TARGET=x86_64-apple-darwin
-        CC="clang -fuse-ld=lld --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX14.0.sdk"
+        CC="clang -fuse-ld=lld --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX14.2.sdk"
         EXE=
 	;;
     macosx64-aarch64)
         export MACOSX_DEPLOYMENT_TARGET=11.0
         TARGET=aarch64-apple-darwin
-        CC="clang -fuse-ld=lld --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX14.0.sdk"
+        CC="clang -fuse-ld=lld --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX14.2.sdk"
         EXE=
 	;;
     *)

diff --git a/taskcluster/scripts/misc/build-pkgconf.sh b/taskcluster/scripts/misc/build-pkgconf.sh
@@ -16,13 +16,13 @@ x86_64-unknown-linux-gnu)
 x86_64-apple-darwin)
     export MACOSX_DEPLOYMENT_TARGET=10.12
     TARGET=$1
-    CC="clang --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX14.0.sdk"
+    CC="clang --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX14.2.sdk"
     EXE=
     ;;
 aarch64-apple-darwin)
     export MACOSX_DEPLOYMENT_TARGET=11.0
     TARGET=$1
-    CC="clang --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX14.0.sdk"
+    CC="clang --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX14.2.sdk"
     EXE=
     ;;
 x86_64-pc-windows-gnu)

diff --git a/taskcluster/scripts/misc/build-rust-based-toolchain.sh b/taskcluster/scripts/misc/build-rust-based-toolchain.sh
@@ -31,8 +31,8 @@ x86_64-unknown-linux-gnu)
     fi
     export CC="$MOZ_FETCHES_DIR/clang/bin/clang"
     export CXX="$MOZ_FETCHES_DIR/clang/bin/clang++"
-    export TARGET_CFLAGS="-isysroot $MOZ_FETCHES_DIR/MacOSX14.0.sdk"
-    export TARGET_CXXFLAGS="-isysroot $MOZ_FETCHES_DIR/MacOSX14.0.sdk -stdlib=libc++"
+    export TARGET_CFLAGS="-isysroot $MOZ_FETCHES_DIR/MacOSX14.2.sdk"
+    export TARGET_CXXFLAGS="-isysroot $MOZ_FETCHES_DIR/MacOSX14.2.sdk -stdlib=libc++"
     ;;
 *-pc-windows-msvc)
     # Cross-compiling for Windows on Linux.

diff --git a/taskcluster/scripts/misc/osx-cross-linker b/taskcluster/scripts/misc/osx-cross-linker
@@ -4,5 +4,5 @@ exec $MOZ_FETCHES_DIR/clang/bin/clang -v \
   -fuse-ld=lld \
   -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.12} \
   -target $TARGET \
-  -isysroot $MOZ_FETCHES_DIR/MacOSX14.0.sdk \
+  -isysroot $MOZ_FETCHES_DIR/MacOSX14.2.sdk \
   "$@"
diff --git a/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh b/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh
@@ -3,7 +3,7 @@ set -x -e -v
 
 export TARGET_TRIPLE="x86_64-apple-darwin"
 
-MACOS_SYSROOT="${MOZ_FETCHES_DIR}/MacOSX14.0.sdk"
+MACOS_SYSROOT="${MOZ_FETCHES_DIR}/MacOSX14.2.sdk"
 CLANGDIR="${MOZ_FETCHES_DIR}/clang"
 
 # Deploy the wrench dependencies