diff --git a/build/macosx/cross-mozconfig.common b/build/macosx/cross-mozconfig.common index 40a62262abb1..0fc1b038f4d3 100644 --- a/build/macosx/cross-mozconfig.common +++ b/build/macosx/cross-mozconfig.common @@ -10,7 +10,7 @@ mk_add_options "export PATH=$MOZ_FETCHES_DIR/cctools/bin:$MOZ_FETCHES_DIR/binuti # dsymutil needs a libstdc++ more recent than what's on the system. mk_add_options "export LD_LIBRARY_PATH=$MOZ_FETCHES_DIR/clang/lib" -CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX10.12.sdk +CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX11.0.sdk export CFLAGS="$CFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}" export CXXFLAGS="$CXXFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}" diff --git a/taskcluster/ci/build/macosx.yml b/taskcluster/ci/build/macosx.yml index 486a16b78138..adac675eb229 100644 --- a/taskcluster/ci/build/macosx.yml +++ b/taskcluster/ci/build/macosx.yml @@ -53,7 +53,7 @@ macosx64/debug: - linux64-cctools-port - linux64-clang - linux64-sccache - - macosx64-sdk-10.12 + - macosx64-sdk-11.0 - sysroot-wasm32-wasi macosx64-hybrid/plain: @@ -82,7 +82,7 @@ macosx64-hybrid/plain: - linux64-cctools-port - linux64-clang - linux64-sccache - - macosx64-sdk-10.12 + - macosx64-sdk-11.0 - sysroot-wasm32-wasi macosx64/opt: @@ -111,7 +111,7 @@ macosx64/opt: - linux64-cctools-port - linux64-clang - linux64-sccache - - macosx64-sdk-10.12 + - macosx64-sdk-11.0 - sysroot-wasm32-wasi macosx64-asan-fuzzing/opt: @@ -142,7 +142,7 @@ macosx64-asan-fuzzing/opt: - linux64-clang - linux64-sccache - macosx64-llvm-symbolizer - - macosx64-sdk-10.12 + - macosx64-sdk-11.0 - sysroot-wasm32-wasi optimization: skip-unless-expanded: null @@ -175,7 +175,7 @@ macosx64-fuzzing/debug: - linux64-cctools-port - linux64-clang - linux64-sccache - - macosx64-sdk-10.12 + - macosx64-sdk-11.0 - sysroot-wasm32-wasi optimization: skip-unless-expanded: null @@ -215,7 +215,7 @@ macosx64-x64-devedition/opt: toolchain: - linux64-cctools-port - linux64-clang - - macosx64-sdk-10.12 + - macosx64-sdk-11.0 - sysroot-wasm32-wasi macosx64-aarch64-devedition/opt: @@ -422,7 +422,7 @@ macosx64-noopt/debug: - linux64-cctools-port - linux64-clang - linux64-sccache - - macosx64-sdk-10.12 + - macosx64-sdk-11.0 - sysroot-wasm32-wasi macosx64-aarch64-noopt/debug: @@ -479,7 +479,7 @@ macosx64-add-on-devel/opt: - linux64-cctools-port - linux64-clang - linux64-sccache - - macosx64-sdk-10.12 + - macosx64-sdk-11.0 - sysroot-wasm32-wasi macosx64-x64-shippable/opt: @@ -513,7 +513,7 @@ macosx64-x64-shippable/opt: toolchain: - linux64-cctools-port - linux64-clang - - macosx64-sdk-10.12 + - macosx64-sdk-11.0 - sysroot-wasm32-wasi macosx64-aarch64-shippable/opt: @@ -718,5 +718,5 @@ macosx64-ccov/opt: - linux64-cctools-port - linux64-clang - linux64-sccache - - macosx64-sdk-10.12 + - macosx64-sdk-11.0 - sysroot-wasm32-wasi diff --git a/taskcluster/ci/instrumented-build/kind.yml b/taskcluster/ci/instrumented-build/kind.yml index 957008c6e264..430d94741b45 100644 --- a/taskcluster/ci/instrumented-build/kind.yml +++ b/taskcluster/ci/instrumented-build/kind.yml @@ -132,7 +132,7 @@ jobs: - linux64-dump_syms - linux64-nasm - linux64-node - - macosx64-sdk-10.12 + - macosx64-sdk-11.0 - sysroot-x86_64-linux-gnu - sysroot-wasm32-wasi diff --git a/taskcluster/ci/searchfox/kind.yml b/taskcluster/ci/searchfox/kind.yml index 81f156be8c87..e2c38129d7c0 100644 --- a/taskcluster/ci/searchfox/kind.yml +++ b/taskcluster/ci/searchfox/kind.yml @@ -96,7 +96,7 @@ jobs: - linux64-rust-macos - linux64-cbindgen - linux64-dump_syms - - macosx64-sdk-10.12 + - macosx64-sdk-11.0 - sysroot-x86_64-linux-gnu - sysroot-wasm32-wasi diff --git a/taskcluster/ci/toolchain/macos-sdk.yml b/taskcluster/ci/toolchain/macos-sdk.yml index 3f39d7df15a2..6675cea995e6 100644 --- a/taskcluster/ci/toolchain/macos-sdk.yml +++ b/taskcluster/ci/toolchain/macos-sdk.yml @@ -24,15 +24,6 @@ macosx64-sdk-10.11: - /Applications/Xcode-7.3.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk toolchain-artifact: project/gecko/mac-sdk/MacOSX10.11.sdk.tar.zst -macosx64-sdk-10.12: - description: "MacOSX10.12 SDK" - treeherder: - symbol: TM(sdk10.12) - run: - arguments: - - /Applications/Xcode-8.3.3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk - toolchain-artifact: project/gecko/mac-sdk/MacOSX10.12.sdk.tar.zst - macosx64-sdk-11.0: description: "MacOSX11.0 SDK" treeherder: diff --git a/taskcluster/ci/webrender/kind.yml b/taskcluster/ci/webrender/kind.yml index 3bb3ea7573f3..b9b5bda10ab4 100644 --- a/taskcluster/ci/webrender/kind.yml +++ b/taskcluster/ci/webrender/kind.yml @@ -113,7 +113,7 @@ jobs: - linux64-rust-macos - linux64-cctools-port - linux64-clang-14 - - macosx64-sdk-10.12 + - macosx64-sdk-11.0 - wrench-deps macosx64-clang-14: - artifact: clang.tar.zst @@ -173,7 +173,7 @@ jobs: - linux64-rust-macos - linux64-cctools-port - linux64-clang - - macosx64-sdk-10.12 + - macosx64-sdk-11.0 - wrench-deps run: using: run-task diff --git a/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh b/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh index 4f7307d810cd..40a7955cc1da 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}/MacOSX10.12.sdk" +MACOS_SYSROOT="${MOZ_FETCHES_DIR}/MacOSX11.0.sdk" CLANGDIR="${MOZ_FETCHES_DIR}/clang" # Deploy the wrench dependencies