diff --git a/browser/config/mozconfigs/macosx64-aarch64/cross-noopt-debug b/browser/config/mozconfigs/macosx64-aarch64/cross-noopt-debug index 6950008f9327..5a95a8e6c3e5 100644 --- a/browser/config/mozconfigs/macosx64-aarch64/cross-noopt-debug +++ b/browser/config/mozconfigs/macosx64-aarch64/cross-noopt-debug @@ -9,6 +9,3 @@ ac_add_options --target=aarch64-apple-darwin # It may conflict with settings from mozconfig.override, but that seems # unlikely. ac_add_options --disable-optimize - -# TODO: Remove in bug 1773743 -export MACOS_SDK_DIR=$MOZ_FETCHES_DIR/MacOSX11.3.sdk diff --git a/browser/config/mozconfigs/macosx64/cross-noopt-debug b/browser/config/mozconfigs/macosx64/cross-noopt-debug index f2d8090b2d88..87461dfd2eb3 100644 --- a/browser/config/mozconfigs/macosx64/cross-noopt-debug +++ b/browser/config/mozconfigs/macosx64/cross-noopt-debug @@ -7,6 +7,3 @@ MOZ_AUTOMATION_BUILD_SYMBOLS=0 # It may conflict with settings from mozconfig.override, but that seems # unlikely. ac_add_options --disable-optimize - -# TODO: Remove in bug 1773743 -export MACOS_SDK_DIR=$MOZ_FETCHES_DIR/MacOSX11.3.sdk diff --git a/browser/config/mozconfigs/macosx64/plain-opt b/browser/config/mozconfigs/macosx64/plain-opt index 8ec850f2aca9..b5c1e469c5df 100644 --- a/browser/config/mozconfigs/macosx64/plain-opt +++ b/browser/config/mozconfigs/macosx64/plain-opt @@ -1,2 +1 @@ ac_add_options --disable-release -export MACOS_SDK_DIR=$MOZ_FETCHES_DIR/MacOSX13.0.sdk diff --git a/build/macosx/mozconfig.common b/build/macosx/mozconfig.common index 633788d3e16b..d92816b00c90 100644 --- a/build/macosx/mozconfig.common +++ b/build/macosx/mozconfig.common @@ -2,8 +2,6 @@ if test `uname -s` = Linux; then . $topsrcdir/build/macosx/cross-mozconfig.common fi -export MACOS_SDK_DIR=$MOZ_FETCHES_DIR/MacOSX13.0.sdk - if [ -n "$TASKCLUSTER_PGO_PROFILE_USE" -a -z "$USE_ARTIFACT" ]; then # Work around https://github.com/llvm/llvm-project/issues/57734 export LDFLAGS=-Wl,-mllvm,--opaque-pointers diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index cd073706a25b..7541634d11d7 100644 --- 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 "11.3" + return "13.0" @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 068f928f3495..9bd13e7e8388 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 - 11.3 + 13.0 diff --git a/taskcluster/ci/build/macosx.yml b/taskcluster/ci/build/macosx.yml index e79685d21041..facfaea4c07b 100644 --- a/taskcluster/ci/build/macosx.yml +++ b/taskcluster/ci/build/macosx.yml @@ -493,7 +493,7 @@ macosx64-noopt/debug: - linux64-cctools-port - linux64-clang - linux64-sccache - - macosx64-sdk-11.3 + - macosx64-sdk - sysroot-wasm32-wasi macosx64-aarch64-noopt/debug: @@ -524,7 +524,7 @@ macosx64-aarch64-noopt/debug: - linux64-cctools-port - linux64-clang - linux64-sccache - - macosx64-sdk-11.3 + - macosx64-sdk - sysroot-wasm32-wasi macosx64-add-on-devel/opt: diff --git a/taskcluster/ci/toolchain/macos-sdk.yml b/taskcluster/ci/toolchain/macos-sdk.yml index b18c61d210e3..a446e90c26de 100644 --- a/taskcluster/ci/toolchain/macos-sdk.yml +++ b/taskcluster/ci/toolchain/macos-sdk.yml @@ -33,26 +33,6 @@ macosx64-sdk-11.0: - /Applications/Xcode-12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk toolchain-artifact: project/gecko/mac-sdk/MacOSX11.0.sdk.tar.zst -macosx64-sdk-11.3: - description: "MacOSX11.3 SDK" - attributes: - local-toolchain: true - treeherder: - symbol: TM(sdk11.3) - worker-type: b-linux-gcp - run: - script: unpack-sdk.py - arguments: - - https://swcdn.apple.com/content/downloads/52/17/002-41708-A_E8MFK7B2PK/6p55tbmh0qttgbt4cy94uuvnacy6tkw435/CLTools_macOSLMOS_SDK.pkg - - b075d3d2f3b066607209a5bbf7cf727a40b98fe65629c5b6abc17f156897af4a - - Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk - toolchain-artifact: project/gecko/mac-sdk/MacOSX11.3.sdk.tar.zst - toolchain-alias: - - MacOSX11.3.sdk - resources: - - python/mozbuild/mozpack/macpkg.py - - taskcluster/scripts/misc/unpack-sdk.py - macosx64-sdk-13.0: description: "MacOSX13.0 SDK" attributes: