From cdd190fccc3dce70f71780d13681bc0edb0bf7cb Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 28 Mar 2024 21:22:56 +0000 Subject: [PATCH] Bug 1887728 - Switch builds to macOS 14.4 SDK. r=spohl,firefox-build-system-reviewers,ahochheiden Differential Revision: https://phabricator.services.mozilla.com/D205627 --- build/moz.configure/toolchain.configure | 2 +- .../configure/macos_fake_sdk/SDKSettings.plist | 2 +- taskcluster/ci/toolchain/macos-sdk.yml | 16 ++++++++-------- taskcluster/ci/toolchain/misc.yml | 4 ++-- taskcluster/scripts/misc/build-custom-car.sh | 2 +- taskcluster/scripts/misc/build-gn-macosx.sh | 2 +- taskcluster/scripts/misc/build-llvm-common.sh | 4 ++-- taskcluster/scripts/misc/build-nasm.sh | 4 ++-- taskcluster/scripts/misc/build-pkgconf.sh | 4 ++-- .../scripts/misc/build-rust-based-toolchain.sh | 4 ++-- taskcluster/scripts/misc/osx-cross-linker | 2 +- .../scripts/misc/wr-macos-cross-build-setup.sh | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 3a603f5da546..0d0249b215d9 100644 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -100,7 +100,7 @@ with only_when(host_is_osx | target_is_osx): ) def mac_sdk_min_version(): - return "14.2" + return "14.4" @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 index 786746f10329..ef035ec3f046 100644 --- 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 @@ Version - 14.2 + 14.4 diff --git a/taskcluster/ci/toolchain/macos-sdk.yml b/taskcluster/ci/toolchain/macos-sdk.yml index 60e4c231fdf3..194a1ee20a02 100644 --- a/taskcluster/ci/toolchain/macos-sdk.yml +++ b/taskcluster/ci/toolchain/macos-sdk.yml @@ -32,20 +32,20 @@ macosx64-sdk-13.3: toolchain-alias: - MacOSX13.3.sdk -macosx64-sdk-14.2: - description: "MacOSX14.2 SDK" +macosx64-sdk-14.4: + description: "MacOSX14.4 SDK" treeherder: - symbol: TM(sdk14.2) + symbol: TM(sdk14.4) run: arguments: - - https://swcdn.apple.com/content/downloads/35/47/042-23550-A_M34N50O9N3/sua6ev7bjcexvorh4709vsgk64zgvsl42p/CLTools_macOSNMOS_SDK.pkg - - 22ce0acc9ab5c28845218b8c686d0208d6bf66bef64a369d3c0622247ba1258b438c9e44c64bb2bacf5e99eb398a6e7a337f2730cd4a969a7f0d2d5d3107306a - - Library/Developer/CommandLineTools/SDKs/MacOSX14.2.sdk - toolchain-artifact: project/gecko/mac-sdk/MacOSX14.2.sdk.tar.zst + - https://swcdn.apple.com/content/downloads/14/48/052-59890-A_I0F5YGAY0Y/p9n40hio7892gou31o1v031ng6fnm9sb3c/CLTools_macOSNMOS_SDK.pkg + - a4e05d2a051027620c86f72694da126a2ceed59b8740270426c4ca3adb38e16fe981b536a373a7f0cdcc84bbe9d9149608ccd03967dbd94262548ccadbfa0f5d + - Library/Developer/CommandLineTools/SDKs/MacOSX14.4.sdk + toolchain-artifact: project/gecko/mac-sdk/MacOSX14.4.sdk.tar.zst toolchain-alias: - macosx64-sdk - macosx64-sdk-toolchain - - MacOSX14.2.sdk + - MacOSX14.4.sdk ios-sdk-17.4: description: "iPhoneOS17.4 SDK" diff --git a/taskcluster/ci/toolchain/misc.yml b/taskcluster/ci/toolchain/misc.yml index 90d34f3c674b..0395096fef72 100644 --- a/taskcluster/ci/toolchain/misc.yml +++ b/taskcluster/ci/toolchain/misc.yml @@ -231,7 +231,7 @@ macosx64-custom-car: toolchain-artifact: public/build/car_macosx.tar.zst fetches: toolchain: - - macosx64-sdk-14.2 + - macosx64-sdk-14.4 macosx-arm64-custom-car: description: "Custom chromium-as-release build for mac (apple silicon)" @@ -267,7 +267,7 @@ macosx-arm64-custom-car: toolchain-artifact: public/build/car_macosx_arm.tar.zst fetches: toolchain: - - macosx64-sdk-14.2 + - macosx64-sdk-14.4 android-custom-car: description: "Custom chromium-as-release build for Android" diff --git a/taskcluster/scripts/misc/build-custom-car.sh b/taskcluster/scripts/misc/build-custom-car.sh index 62c135c83e22..78757a46649a 100755 --- 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.2.sdk" + export MACOS_SYSROOT="$MOZ_FETCHES_DIR/MacOSX14.4.sdk" # Avoid mixing up the system python and toolchain python in the # python path configuration diff --git a/taskcluster/scripts/misc/build-gn-macosx.sh b/taskcluster/scripts/misc/build-gn-macosx.sh index 0d7f5d50a368..01285f4731d1 100755 --- 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.2.sdk +CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX14.4.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 index 73efc5093d25..a5cd8b542f8f 100755 --- 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.2.sdk + -DCMAKE_OSX_SYSROOT=$MOZ_FETCHES_DIR/MacOSX14.4.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.2.sdk + -DDARWIN_osx_SYSROOT=$MOZ_FETCHES_DIR/MacOSX14.4.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 index 98370b312f29..bf01b8cc551d 100755 --- 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.2.sdk" + CC="clang -fuse-ld=lld --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX14.4.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.2.sdk" + CC="clang -fuse-ld=lld --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX14.4.sdk" EXE= ;; *) diff --git a/taskcluster/scripts/misc/build-pkgconf.sh b/taskcluster/scripts/misc/build-pkgconf.sh index ef211eeef166..330a8c53f3a1 100755 --- 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.2.sdk" + CC="clang --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX14.4.sdk" EXE= ;; aarch64-apple-darwin) export MACOSX_DEPLOYMENT_TARGET=11.0 TARGET=$1 - CC="clang --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX14.2.sdk" + CC="clang --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX14.4.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 index 707ba9d478f8..42715f66071e 100755 --- 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.2.sdk" - export TARGET_CXXFLAGS="-isysroot $MOZ_FETCHES_DIR/MacOSX14.2.sdk -stdlib=libc++" + export TARGET_CFLAGS="-isysroot $MOZ_FETCHES_DIR/MacOSX14.4.sdk" + export TARGET_CXXFLAGS="-isysroot $MOZ_FETCHES_DIR/MacOSX14.4.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 index ec08589524b8..886002bb07c9 100755 --- 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.2.sdk \ + -isysroot $MOZ_FETCHES_DIR/MacOSX14.4.sdk \ "$@" diff --git a/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh b/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh index bfed36012c71..d984f8d8e83a 100755 --- 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.2.sdk" +MACOS_SYSROOT="${MOZ_FETCHES_DIR}/MacOSX14.4.sdk" CLANGDIR="${MOZ_FETCHES_DIR}/clang" # Deploy the wrench dependencies