commit 40fc04729c6aeeba36fc6e254e5df96bc5c54d1d parent 76ec249d7110574d83047a129c46ae5972155a0b Author: Ryan VanderMeulen <rvandermeulen@mozilla.com> Date: Wed, 8 Oct 2025 02:37:46 +0000 Bug 1992910 - Set the macOS deployment target for x86-64 builds to 10.15. r=firefox-build-system-reviewers,glandium Differential Revision: https://phabricator.services.mozilla.com/D267725 Diffstat:
11 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py @@ -661,7 +661,7 @@ def main(): if is_darwin(target): os.environ["MACOSX_DEPLOYMENT_TARGET"] = ( - "11.0" if target.startswith("aarch64") else "10.12" + "11.0" if target.startswith("aarch64") else "10.15" ) if is_windows(target): diff --git a/build/gyp.mozbuild b/build/gyp.mozbuild @@ -19,9 +19,8 @@ gyp_vars.update( ), "build_with_mozilla": 1, "build_with_chromium": 0, - # 10.9 once we move to TC cross-compiles - bug 1270217 - "mac_sdk_min": "10.9", - "mac_deployment_target": "10.9", + "mac_sdk_min": "10.15", + "mac_deployment_target": "10.15", "use_official_google_api_keys": 0, "have_clock_monotonic": 1 if CONFIG["HAVE_CLOCK_MONOTONIC"] else 0, "have_ethtool_cmd_speed_hi": ( diff --git a/taskcluster/scripts/misc/build-clang.sh b/taskcluster/scripts/misc/build-clang.sh @@ -22,7 +22,7 @@ case "$CONFIGS" in # version doesn't really matter: as of writing, cmake checks at most for 10.5. mkdir -p $ORIGPWD/bin echo "#!/bin/sh" > $ORIGPWD/bin/sw_vers - echo echo 10.12 >> $ORIGPWD/bin/sw_vers + echo echo 10.15 >> $ORIGPWD/bin/sw_vers chmod +x $ORIGPWD/bin/sw_vers # these variables are used in build-clang.py export OSX_SYSROOT=$(ls -d $MOZ_FETCHES_DIR/MacOSX*.sdk) diff --git a/taskcluster/scripts/misc/build-cpython.sh b/taskcluster/scripts/misc/build-cpython.sh @@ -32,7 +32,7 @@ case `uname -s` in macosx_version_min=11.0 ;; *) - macosx_version_min=10.12 + macosx_version_min=10.15 ;; esac # NOTE: both CFLAGS and CPPFLAGS need to be set here, otherwise diff --git a/taskcluster/scripts/misc/build-geckodriver.sh b/taskcluster/scripts/misc/build-geckodriver.sh @@ -29,7 +29,7 @@ case "$TARGET" in if test "$TARGET" = "aarch64-apple-darwin"; then export MACOSX_DEPLOYMENT_TARGET=11.0 else - export MACOSX_DEPLOYMENT_TARGET=10.12 + export MACOSX_DEPLOYMENT_TARGET=10.15 fi ;; aarch64-unknown-linux-musl) diff --git a/taskcluster/scripts/misc/build-gn-macosx.sh b/taskcluster/scripts/misc/build-gn-macosx.sh @@ -6,7 +6,7 @@ set -e -v WORKSPACE=$HOME/workspace CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX26.0.sdk -export MACOSX_DEPLOYMENT_TARGET=10.12 +export MACOSX_DEPLOYMENT_TARGET=10.15 export CC=$MOZ_FETCHES_DIR/clang/bin/clang export CXX=$MOZ_FETCHES_DIR/clang/bin/clang++ diff --git a/taskcluster/scripts/misc/build-llvm-common.sh b/taskcluster/scripts/misc/build-llvm-common.sh @@ -27,7 +27,7 @@ aarch64-apple-darwin) ;; x86_64-apple-darwin) arch=x86_64 - export MACOSX_DEPLOYMENT_TARGET=10.12 + export MACOSX_DEPLOYMENT_TARGET=10.15 ;; esac @@ -56,7 +56,7 @@ case "$target" in # obviously missing when cross-compiling, so create a fake one. The exact # version doesn't really matter: as of writing, cmake checks at most for 10.5. echo "#!/bin/sh" > sw_vers - echo echo 10.12 >> sw_vers + echo echo 10.15 >> sw_vers chmod +x sw_vers PATH="$PATH:$PWD" ;; diff --git a/taskcluster/scripts/misc/build-nasm.sh b/taskcluster/scripts/misc/build-nasm.sh @@ -36,7 +36,7 @@ case "$1" in EXE=.exe ;; macosx64) - export MACOSX_DEPLOYMENT_TARGET=10.12 + export MACOSX_DEPLOYMENT_TARGET=10.15 TARGET=x86_64-apple-darwin 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 @@ -19,7 +19,7 @@ aarch64-unknown-linux-gnu) EXE= ;; x86_64-apple-darwin) - export MACOSX_DEPLOYMENT_TARGET=10.12 + export MACOSX_DEPLOYMENT_TARGET=10.15 TARGET=$1 CC="clang --target=$TARGET -isysroot $MOZ_FETCHES_DIR/MacOSX26.0.sdk" EXE= diff --git a/taskcluster/scripts/misc/build-rust-based-toolchain.sh b/taskcluster/scripts/misc/build-rust-based-toolchain.sh @@ -40,7 +40,7 @@ aarch64-unknown-linux-gnu) if test "$TARGET" = "aarch64-apple-darwin"; then export MACOSX_DEPLOYMENT_TARGET=11.0 else - export MACOSX_DEPLOYMENT_TARGET=10.12 + export MACOSX_DEPLOYMENT_TARGET=10.15 fi 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" diff --git a/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh b/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh @@ -44,10 +44,10 @@ export ZLIB_LIBS="-L${MACOS_SYSROOT}/usr/lib -lz" # Set up compiler and flags for cross-compile. Careful to only export the # target-specific CFLAGS/CXXFLAGS variables, to not break any host builds. export CC="${CLANGDIR}/bin/clang" -TARGET_CFLAGS="-fuse-ld=lld -target ${TARGET_TRIPLE} -mmacosx-version-min=10.12 --rtlib=compiler-rt --sysroot ${MACOS_SYSROOT} -Qunused-arguments" +TARGET_CFLAGS="-fuse-ld=lld -target ${TARGET_TRIPLE} -mmacosx-version-min=10.15 --rtlib=compiler-rt --sysroot ${MACOS_SYSROOT} -Qunused-arguments" export CFLAGS_${TARGET_TRIPLE//-/_}="${TARGET_CFLAGS}" export CXX="${CLANGDIR}/bin/clang++" -TARGET_CXXFLAGS="-fuse-ld=lld -target ${TARGET_TRIPLE} -mmacosx-version-min=10.12 --rtlib=compiler-rt --sysroot ${MACOS_SYSROOT} -stdlib=libc++ -Qunused-arguments" +TARGET_CXXFLAGS="-fuse-ld=lld -target ${TARGET_TRIPLE} -mmacosx-version-min=10.15 --rtlib=compiler-rt --sysroot ${MACOS_SYSROOT} -stdlib=libc++ -Qunused-arguments" export CXXFLAGS_${TARGET_TRIPLE//-/_}="${TARGET_CXXFLAGS}" export AR="${CLANGDIR}/bin/llvm-ar"