commit 76ec249d7110574d83047a129c46ae5972155a0b parent a9b9b8afa4c6fb3e01abe714033d6be1e2d1b169 Author: Ryan VanderMeulen <rvandermeulen@mozilla.com> Date: Wed, 8 Oct 2025 02:37:45 +0000 Bug 1992910 - Migrate most macOS jobs to SDK 26.0. r=firefox-build-system-reviewers,releng-reviewers,glandium,bhearsum,ahochheiden Differential Revision: https://phabricator.services.mozilla.com/D267724 Diffstat:
11 files changed, 18 insertions(+), 33 deletions(-)
diff --git a/taskcluster/kinds/openh264-plugin/kind.yml b/taskcluster/kinds/openh264-plugin/kind.yml @@ -125,7 +125,7 @@ tasks: - linux64-clang - linux64-dump_syms - linux64-nasm - - macosx64-sdk-13.3 + - macosx64-sdk-26.0 macosx64-aarch64/opt: attributes: build_platform: macosx64-aarch64 @@ -149,7 +149,7 @@ tasks: - linux64-cctools-port - linux64-clang - linux64-dump_syms - - macosx64-sdk-13.3 + - macosx64-sdk-26.0 win32/opt: attributes: build_platform: win32 diff --git a/taskcluster/kinds/toolchain/macos-sdk.yml b/taskcluster/kinds/toolchain/macos-sdk.yml @@ -29,25 +29,9 @@ macosx64-sdk-13.3: - 8de3306508dca31040b3b49ff370e96c94f4546bcf22cb4069abbb18e2d6bce8e20d40a6903f00ae75558175b624a979ea0444f54bc6d9d67e841f2000b0d863 - Library/Developer/CommandLineTools/SDKs/MacOSX13.3.sdk toolchain-artifact: project/gecko/mac-sdk/MacOSX13.3.sdk.tar.zst - toolchain-alias: - - MacOSX13.3.sdk - -macosx64-sdk-15.4: - description: "MacOSX15.4 SDK" - treeherder: - symbol: TM(sdk15.4) - run: - arguments: - - https://swcdn.apple.com/content/downloads/10/32/082-12052-A_AHPGDY76PT/1a419zaf3vh8o9t3c0usblyr8eystpnsh5/CLTools_macOSNMOS_SDK.pkg - - fd01c70038dbef48bd23fb8b7d18f234910733635f1b44518e71a66d2db92a70180e6a595c6bdd837fa8df7e9b297e570560842e9a6db863840bd051fe69fea5 - - Library/Developer/CommandLineTools/SDKs/MacOSX15.4.sdk - toolchain-artifact: project/gecko/mac-sdk/MacOSX15.4.sdk.tar.zst - toolchain-alias: - - macosx64-sdk-toolchain - - MacOSX15.4.sdk macosx64-sdk-26.0: - description: "MacOSX26.0 SDK" + description: "macOS 26.0 SDK" treeherder: symbol: TM(sdk26.0) run: @@ -58,6 +42,7 @@ macosx64-sdk-26.0: toolchain-artifact: project/gecko/mac-sdk/MacOSX26.0.sdk.tar.zst toolchain-alias: - macosx64-sdk + - macosx64-sdk-toolchain - MacOSX26.0.sdk ios-sdk-18.4: diff --git a/taskcluster/scripts/misc/build-cpython.sh b/taskcluster/scripts/misc/build-cpython.sh @@ -37,7 +37,7 @@ case `uname -s` in esac # NOTE: both CFLAGS and CPPFLAGS need to be set here, otherwise # configure step fails. - sysroot_flags="-isysroot ${MOZ_FETCHES_DIR}/MacOSX15.4.sdk -mmacosx-version-min=${macosx_version_min}" + sysroot_flags="-isysroot ${MOZ_FETCHES_DIR}/MacOSX26.0.sdk -mmacosx-version-min=${macosx_version_min}" export CPPFLAGS="${sysroot_flags} -I${xz_prefix}/include" export CFLAGS=${sysroot_flags} export LDFLAGS="${LDFLAGS} ${sysroot_flags} -L${xz_prefix}/lib" diff --git a/taskcluster/scripts/misc/build-geckodriver.sh b/taskcluster/scripts/misc/build-geckodriver.sh @@ -25,7 +25,7 @@ case "$TARGET" in # OSX cross builds are a bit harder *-apple-darwin) export PATH="$MOZ_FETCHES_DIR/clang/bin:$PATH" - RUSTFLAGS="-Clinker=$MOZ_FETCHES_DIR/clang/bin/clang++ -C link-arg=-isysroot -C link-arg=$MOZ_FETCHES_DIR/MacOSX15.4.sdk -C link-arg=-fuse-ld=lld -C link-arg=--target=$TARGET" + RUSTFLAGS="-Clinker=$MOZ_FETCHES_DIR/clang/bin/clang++ -C link-arg=-isysroot -C link-arg=$MOZ_FETCHES_DIR/MacOSX26.0.sdk -C link-arg=-fuse-ld=lld -C link-arg=--target=$TARGET" if test "$TARGET" = "aarch64-apple-darwin"; then export MACOSX_DEPLOYMENT_TARGET=11.0 else 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/MacOSX15.4.sdk +CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX26.0.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/MacOSX15.4.sdk + -DCMAKE_OSX_SYSROOT=$MOZ_FETCHES_DIR/MacOSX26.0.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/MacOSX15.4.sdk + -DDARWIN_osx_SYSROOT=$MOZ_FETCHES_DIR/MacOSX26.0.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/MacOSX15.4.sdk" + CC="clang -fuse-ld=lld --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX26.0.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/MacOSX15.4.sdk" + CC="clang -fuse-ld=lld --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX26.0.sdk" EXE= ;; *) diff --git a/taskcluster/scripts/misc/build-pkgconf.sh b/taskcluster/scripts/misc/build-pkgconf.sh @@ -21,13 +21,13 @@ aarch64-unknown-linux-gnu) x86_64-apple-darwin) export MACOSX_DEPLOYMENT_TARGET=10.12 TARGET=$1 - CC="clang --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX15.4.sdk" + CC="clang --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX26.0.sdk" EXE= ;; aarch64-apple-darwin) export MACOSX_DEPLOYMENT_TARGET=11.0 TARGET=$1 - CC="clang --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX15.4.sdk" + CC="clang --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX26.0.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 @@ -42,7 +42,7 @@ aarch64-unknown-linux-gnu) else export MACOSX_DEPLOYMENT_TARGET=10.12 fi - MACOS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX15.4.sdk + MACOS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX26.0.sdk export RUSTFLAGS="-Clinker=$MOZ_FETCHES_DIR/clang/bin/clang++ -C link-arg=-isysroot -C link-arg=$MACOS_SYSROOT -C link-arg=-fuse-ld=lld -C link-arg=--target=$TARGET $rust_lto_flags" export CC="$MOZ_FETCHES_DIR/clang/bin/clang" export CXX="$MOZ_FETCHES_DIR/clang/bin/clang++" diff --git a/testing/mozharness/configs/openh264/macosx64-aarch64.py b/testing/mozharness/configs/openh264/macosx64-aarch64.py @@ -22,14 +22,14 @@ config = { "partial_env": { "CFLAGS": ( "-target aarch64-apple-darwin -mcpu=apple-a12 " - "-isysroot {MOZ_FETCHES_DIR}/MacOSX13.3.sdk " + "-isysroot {MOZ_FETCHES_DIR}/MacOSX26.0.sdk " "-mmacosx-version-min=11.0".format( MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"] ) ), "LDFLAGS": ( "-target aarch64-apple-darwin -mcpu=apple-a12 " - "-isysroot {MOZ_FETCHES_DIR}/MacOSX13.3.sdk " + "-isysroot {MOZ_FETCHES_DIR}/MacOSX26.0.sdk " "-mmacosx-version-min=11.0".format( MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"] ) diff --git a/testing/mozharness/configs/openh264/macosx64.py b/testing/mozharness/configs/openh264/macosx64.py @@ -22,14 +22,14 @@ config = { "partial_env": { "CXXFLAGS": ( "-target x86_64-apple-darwin " - "-isysroot {MOZ_FETCHES_DIR}/MacOSX13.3.sdk " + "-isysroot {MOZ_FETCHES_DIR}/MacOSX26.0.sdk " "-mmacosx-version-min=10.12".format( MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"] ) ), "LDFLAGS": ( "-target x86_64-apple-darwin " - "-isysroot {MOZ_FETCHES_DIR}/MacOSX13.3.sdk " + "-isysroot {MOZ_FETCHES_DIR}/MacOSX26.0.sdk " "-mmacosx-version-min=10.12".format( MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"] )