Bug 1680152 - Bump macos SDK to 10.12. r=spohl,firefox-build-system-reviewers,mhentges

Differential Revision: https://phabricator.services.mozilla.com/D98421
2024-10-08 02:14:43 +00:00 · 2020-12-02 21:50:28 +00:00 · 2020-12-02 21:50:28 +00:00 · 12679da6a0
commit 12679da6a0
parent f1d7e7f48c
13 changed files with 17 additions and 27 deletions
--- a/browser/config/tooltool-manifests/macosx64/cross-releng-12.manifest
+++ b/browser/config/tooltool-manifests/macosx64/cross-releng-12.manifest
@ -1,10 +0,0 @@
-[
-  {
-    "size": 31991917,
-    "visibility": "internal",
-    "digest": "c5c0be09972b56b5980dc9d06b61ff49cf58c4572913437256a79b202e19e936af3c0ab0924df72b9f648d518c257597f84800a84bb80e68af4eabdaf1df5f24",
-    "algorithm": "sha512",
-    "unpack": true,
-    "filename": "MacOSX10.12.sdk.tar.bz2"
-  }
-]
--- a/browser/config/tooltool-manifests/macosx64/cross-releng.manifest
+++ b/browser/config/tooltool-manifests/macosx64/cross-releng.manifest
@ -1,10 +1,10 @@
 [
  {
-    "size": 34094283,
+    "size": 31991917,
    "visibility": "internal",
-    "digest": "8811050fe375bcc566c8b85173d86b8a87aa2148edfed93023735c2de44b66a5a28cbaa1cfd396032447fd803e03f308ed941a200c0e2a1ad9fbe16b5606ee7c",
+    "digest": "c5c0be09972b56b5980dc9d06b61ff49cf58c4572913437256a79b202e19e936af3c0ab0924df72b9f648d518c257597f84800a84bb80e68af4eabdaf1df5f24",
    "algorithm": "sha512",
    "unpack": true,
-    "filename": "MacOSX10.11.sdk.tar.xz"
+    "filename": "MacOSX10.12.sdk.tar.bz2"
  }
 ]
--- a/build/macosx/cross-mozconfig.common
+++ b/build/macosx/cross-mozconfig.common
@ -16,7 +16,7 @@ mk_add_options "export LD_LIBRARY_PATH=$MOZ_FETCHES_DIR/clang/lib"
 #   tar -C $(dirname ${sdk_path}) -cHjf /tmp/$(basename ${sdk_path}).tar.bz2 $(basename ${sdk_path})
 # Upload the resulting tarball from /tmp to tooltool, and change the entry in
 # `browser/config/tooltool-manifests/macosx64/cross-releng.manifest`.
-CROSS_SYSROOT=$topsrcdir/MacOSX10.11.sdk
+CROSS_SYSROOT=$topsrcdir/MacOSX10.12.sdk

 export CC="$MOZ_FETCHES_DIR/clang/bin/clang"
 export CXX="$MOZ_FETCHES_DIR/clang/bin/clang++"
--- a/taskcluster/ci/toolchain/clang-tidy.yml
+++ b/taskcluster/ci/toolchain/clang-tidy.yml
@ -51,7 +51,7 @@ macosx64-clang-tidy:
    worker-type: b-linux-large
    worker:
        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng-12.manifest"
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
    run:
        using: toolchain-script
        script: build-clang.sh
--- a/taskcluster/ci/toolchain/clang.yml
+++ b/taskcluster/ci/toolchain/clang.yml
@ -445,7 +445,7 @@ macosx64-clang-11:
    worker:
        max-run-time: 3600
        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng-12.manifest"
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
    run-on-projects:
        - trunk
    run:
--- a/taskcluster/scripts/misc/build-dump-syms.sh
+++ b/taskcluster/scripts/misc/build-dump-syms.sh
@ -35,8 +35,8 @@ Linux)
        export PATH="$MOZ_FETCHES_DIR/cctools/bin:$PATH"
        export RUSTFLAGS="-C linker=$GECKO_PATH/taskcluster/scripts/misc/osx-cross-linker"
        export CC="$MOZ_FETCHES_DIR/clang/bin/clang"
-        export TARGET_CC="$MOZ_FETCHES_DIR/clang/bin/clang -isysroot $MOZ_FETCHES_DIR/MacOSX10.11.sdk"
-        export TARGET_CXX="$MOZ_FETCHES_DIR/clang/bin/clang++ -isysroot $MOZ_FETCHES_DIR/MacOSX10.11.sdk -stdlib=libc++"
+        export TARGET_CC="$MOZ_FETCHES_DIR/clang/bin/clang -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk"
+        export TARGET_CXX="$MOZ_FETCHES_DIR/clang/bin/clang++ -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk -stdlib=libc++"
        cargo build --verbose --release --target $TARGET
    else
        export RUSTFLAGS=-Clinker=clang++
--- a/taskcluster/scripts/misc/build-fix-stacks.sh
+++ b/taskcluster/scripts/misc/build-fix-stacks.sh
@ -27,8 +27,8 @@ x86_64-apple-darwin)
    export CXX=$MOZ_FETCHES_DIR/clang/bin/clang++
    export PATH="$MOZ_FETCHES_DIR/cctools/bin:$PATH"
    export RUSTFLAGS="-C linker=$GECKO_PATH/taskcluster/scripts/misc/osx-cross-linker"
-    export TARGET_CC="$CC -isysroot $MOZ_FETCHES_DIR/MacOSX10.11.sdk"
-    export TARGET_CXX="$CXX -isysroot $MOZ_FETCHES_DIR/MacOSX10.11.sdk"
+    export TARGET_CC="$CC -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk"
+    export TARGET_CXX="$CXX -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk"
    ;;
 i686-pc-windows-msvc)
    # Cross-compiling for Windows on Linux.
--- a/taskcluster/scripts/misc/build-gn-macosx.sh
+++ b/taskcluster/scripts/misc/build-gn-macosx.sh
@ -7,7 +7,7 @@ WORKSPACE=$HOME/workspace
 COMPRESS_EXT=xz

 CROSS_CCTOOLS_PATH=$MOZ_FETCHES_DIR/cctools
-CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX10.11.sdk
+CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX10.12.sdk

 export CC=$MOZ_FETCHES_DIR/clang/bin/clang
 export CXX=$MOZ_FETCHES_DIR/clang/bin/clang++
--- a/taskcluster/scripts/misc/build-minidump-stackwalk.sh
+++ b/taskcluster/scripts/misc/build-minidump-stackwalk.sh
@ -21,7 +21,7 @@ case "$1" in
 macosx64)
    TOOLCHAINS="cctools rustc clang"
    echo ac_add_options --target=x86_64-apple-darwin >> .mozconfig
-    echo ac_add_options --with-macos-sdk=$MOZ_FETCHES_DIR/MacOSX10.11.sdk >> .mozconfig
+    echo ac_add_options --with-macos-sdk=$MOZ_FETCHES_DIR/MacOSX10.12.sdk >> .mozconfig
    ;;
 mingw32)
    TOOLCHAINS="binutils rustc clang"
--- a/taskcluster/scripts/misc/build-nasm.sh
+++ b/taskcluster/scripts/misc/build-nasm.sh
@ -17,7 +17,7 @@ case "$1" in
    macosx64)
        export PATH="$MOZ_FETCHES_DIR/clang/bin:$MOZ_FETCHES_DIR/cctools/bin:$PATH"
        export LD_LIBRARY_PATH="$MOZ_FETCHES_DIR/clang/lib"
-        ./configure CC="clang --target=x86_64-apple-darwin -isysroot $MOZ_FETCHES_DIR/MacOSX10.11.sdk" --host=x86_64-apple-darwin
+        ./configure CC="clang --target=x86_64-apple-darwin -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk" --host=x86_64-apple-darwin
 	cat config.log
        EXE=
 	;;
--- a/taskcluster/scripts/misc/build-sccache.sh
+++ b/taskcluster/scripts/misc/build-sccache.sh
@ -38,7 +38,7 @@ Linux)
        export PATH="$MOZ_FETCHES_DIR/cctools/bin:$PATH"
        export RUSTFLAGS="-C linker=$GECKO_PATH/taskcluster/scripts/misc/osx-cross-linker"
        export CC="$MOZ_FETCHES_DIR/clang/bin/clang"
-        export TARGET_CC="$MOZ_FETCHES_DIR/clang/bin/clang -isysroot $MOZ_FETCHES_DIR/MacOSX10.11.sdk"
+        export TARGET_CC="$MOZ_FETCHES_DIR/clang/bin/clang -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk"
        cargo build --features "all $COMMON_FEATURES" --verbose --release --target $TARGET
    else
        cargo build --features "all dist-server openssl/vendored $COMMON_FEATURES" --verbose --release
--- a/taskcluster/scripts/misc/osx-cross-linker
+++ b/taskcluster/scripts/misc/osx-cross-linker
@ -1,7 +1,7 @@
 exec $MOZ_FETCHES_DIR/clang/bin/clang -v \
  -fuse-ld=$MOZ_FETCHES_DIR/cctools/bin/x86_64-apple-darwin-ld \
-  -mmacosx-version-min=10.11 \
+  -mmacosx-version-min=10.12 \
  -target $TARGET \
  -B $MOZ_FETCHES_DIR/cctools/bin \
-  -isysroot $MOZ_FETCHES_DIR/MacOSX10.11.sdk \
+  -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk \
  "$@"
--- a/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh
+++ b/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh
@ -5,7 +5,7 @@ export TARGET_TRIPLE="x86_64-apple-darwin"

 source "${GECKO_PATH}/taskcluster/scripts/misc/tooltool-download.sh"

-MACOS_SYSROOT="${MOZ_FETCHES_DIR}/MacOSX10.11.sdk"
+MACOS_SYSROOT="${MOZ_FETCHES_DIR}/MacOSX10.12.sdk"
 CLANGDIR="${MOZ_FETCHES_DIR}/clang"

 # Deploy the wrench dependencies