Backed out changeset 572b175efb09 (bug 1696504) for causing regressions. a=backout
authorSandor Molnar <smolnar@mozilla.com>
Wed, 01 Dec 2021 19:48:29 +0200
changeset 600763 b1571319e4cdb9e3ae3f024bd3a4921a53da7b76
parent 600762 0f45428ec94f51be4f574d10cc6c795c7392d7bc
child 600786 90320622ce99c837d42e42023be8342a8540f690
push id39028
push usersmolnar@mozilla.com
push dateWed, 01 Dec 2021 17:53:45 +0000
treeherdermozilla-central@b1571319e4cd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1696504
milestone96.0a1
backs out572b175efb0960eb15cc814d9c8f8f65afecae52
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 572b175efb09 (bug 1696504) for causing regressions. a=backout
build/macosx/cross-mozconfig.common
taskcluster/ci/build/macosx.yml
taskcluster/ci/instrumented-build/kind.yml
taskcluster/ci/searchfox/kind.yml
taskcluster/ci/toolchain/macos-sdk.yml
taskcluster/ci/webrender/kind.yml
taskcluster/scripts/misc/wr-macos-cross-build-setup.sh
--- a/build/macosx/cross-mozconfig.common
+++ b/build/macosx/cross-mozconfig.common
@@ -5,17 +5,17 @@
 . "$topsrcdir/build/mozconfig.common"
 
 # cctools for ld, ar, and other related tools ; dsymutil for rust.
 mk_add_options "export PATH=$MOZ_FETCHES_DIR/cctools/bin:$MOZ_FETCHES_DIR/binutils/bin:$MOZ_FETCHES_DIR/clang/bin:$PATH"
 
 # 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/MacOSX11.0.sdk
+CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX10.12.sdk
 
 export CFLAGS="$CFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}"
 export CXXFLAGS="$CXXFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}"
 export DSYMUTIL=$MOZ_FETCHES_DIR/clang/bin/dsymutil
 export MKFSHFS=$MOZ_FETCHES_DIR/hfsplus-tools/newfs_hfs
 export DMG_TOOL=$MOZ_FETCHES_DIR/dmg/dmg
 export HFS_TOOL=$MOZ_FETCHES_DIR/dmg/hfsplus
 
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -48,17 +48,17 @@ macosx64/debug:
         custom-build-variant-cfg: cross-debug
         mozconfig-variant: debug
     use-sccache: true
     fetches:
         toolchain:
             - linux64-cctools-port
             - linux64-clang-macosx-cross
             - linux64-sccache
-            - macosx64-sdk-11.0
+            - macosx64-sdk-10.12
             - sysroot-wasm32-wasi
 
 macosx64-hybrid/plain:
     description: "MacOS X x64 Hybrid Cross-compile"
     index:
         job-name: macosx64-hybrid
     treeherder:
         platform: osx-cross/plain
@@ -77,17 +77,17 @@ macosx64-hybrid/plain:
             disable_package_metrics: true
     use-sccache: true
     run-on-projects: ['integration']
     fetches:
         toolchain:
             - linux64-cctools-port
             - linux64-clang-macosx-cross
             - linux64-sccache
-            - macosx64-sdk-11.0
+            - macosx64-sdk-10.12
             - sysroot-wasm32-wasi
 
 macosx64/opt:
     description: "MacOS X x64 Cross-compile"
     index:
         job-name: macosx64-opt
     attributes:
         enable-build-signing: true
@@ -106,17 +106,17 @@ macosx64/opt:
             - builds/releng_base_mac_64_cross_builds.py
     run-on-projects: ['integration']
     use-sccache: true
     fetches:
         toolchain:
             - linux64-cctools-port
             - linux64-clang-macosx-cross
             - linux64-sccache
-            - macosx64-sdk-11.0
+            - macosx64-sdk-10.12
             - sysroot-wasm32-wasi
 
 macosx64-asan-fuzzing/opt:
     description: "MacOS X x64 Cross-compile Fuzzing ASAN"
     index:
         job-name: macosx64-fuzzing-asan-opt
     treeherder:
         platform: osx-cross/asan
@@ -133,17 +133,17 @@ macosx64-asan-fuzzing/opt:
         mozconfig-variant: nightly-fuzzing-asan
     use-sccache: true
     fetches:
         toolchain:
             - linux64-cctools-port
             - linux64-clang-macosx-cross
             - linux64-sccache
             - macosx64-llvm-symbolizer
-            - macosx64-sdk-11.0
+            - macosx64-sdk-10.12
             - sysroot-wasm32-wasi
     optimization:
         skip-unless-expanded: null
 
 macosx64-fuzzing/debug:
     description: "MacOS X x64 Cross-compile Fuzzing Debug"
     index:
         job-name: macosx64-fuzzing-debug
@@ -163,17 +163,17 @@ macosx64-fuzzing/debug:
         custom-build-variant-cfg: cross-fuzzing-debug
         mozconfig-variant: debug-fuzzing
     use-sccache: true
     fetches:
         toolchain:
             - linux64-cctools-port
             - linux64-clang-macosx-cross
             - linux64-sccache
-            - macosx64-sdk-11.0
+            - macosx64-sdk-10.12
             - sysroot-wasm32-wasi
     optimization:
         skip-unless-expanded: null
 
 macosx64-x64-devedition/opt:
     description: "MacOS X Dev Edition x64 (shippable)"
     use-pgo: macosx64-shippable/opt
     attributes:
@@ -201,17 +201,17 @@ macosx64-x64-devedition/opt:
         extra-config:
             stage_platform: macosx64-devedition
         mozconfig-variant: devedition
     run-on-projects: ['mozilla-beta']
     fetches:
         toolchain:
             - linux64-cctools-port
             - linux64-clang-macosx-cross
-            - macosx64-sdk-11.0
+            - macosx64-sdk-10.12
             - sysroot-wasm32-wasi
 
 macosx64-aarch64-devedition/opt:
     description: "MacOS X Dev Edition Aarch64 (shippable)"
     use-pgo: macosx64-shippable/opt
     attributes:
         enable-full-crashsymbols: true
         skip-verify-test-packaging: true
@@ -405,17 +405,17 @@ macosx64-noopt/debug:
         keep-artifacts: false
     run-on-projects: ['mozilla-central']
     use-sccache: true
     fetches:
         toolchain:
             - linux64-cctools-port
             - linux64-clang-macosx-cross
             - linux64-sccache
-            - macosx64-sdk-11.0
+            - macosx64-sdk-10.12
             - sysroot-wasm32-wasi
 
 macosx64-add-on-devel/opt:
     description: "MacOS X x64 add-on-devel"
     index:
         job-name: macosx64-add-on-devel
     treeherder:
         platform: osx-cross-add-on-devel/opt
@@ -431,17 +431,17 @@ macosx64-add-on-devel/opt:
         mozconfig-variant: add-on-devel
     run-on-projects: ['mozilla-beta', 'mozilla-release']
     use-sccache: true
     fetches:
         toolchain:
             - linux64-cctools-port
             - linux64-clang-macosx-cross
             - linux64-sccache
-            - macosx64-sdk-11.0
+            - macosx64-sdk-10.12
             - sysroot-wasm32-wasi
 
 macosx64-x64-shippable/opt:
     description: "MacOS X x64 Cross-compile"
     use-pgo: macosx64-shippable/opt
     attributes:
         enable-full-crashsymbols: true
         skip-verify-test-packaging: true
@@ -463,17 +463,17 @@ macosx64-x64-shippable/opt:
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_mac_64_cross_builds.py
             - taskcluster_nightly.py
     fetches:
         toolchain:
             - linux64-cctools-port
             - linux64-clang-macosx-cross
-            - macosx64-sdk-11.0
+            - macosx64-sdk-10.12
             - sysroot-wasm32-wasi
 
 macosx64-aarch64-shippable/opt:
     description: "MacOS X aarch64 Cross-compile"
     use-pgo: macosx64-shippable/opt
     attributes:
         enable-full-crashsymbols: true
         skip-verify-test-packaging: true
@@ -665,17 +665,17 @@ macosx64-ccov/opt:
         mozconfig-variant: code-coverage
     run-on-projects: ['mozilla-central']
     use-sccache: false
     fetches:
         toolchain:
             - linux64-cctools-port
             - linux64-clang-macosx-cross
             - linux64-sccache
-            - macosx64-sdk-11.0
+            - macosx64-sdk-10.12
             - sysroot-wasm32-wasi
 
 macosx64-gcp/debug:
     description: "MacOS X x64 Cross-compile - built on GCP"
     index:
         job-name: macosx64-gcp-debug
     attributes:
         enable-full-crashsymbols: true
@@ -695,17 +695,17 @@ macosx64-gcp/debug:
         custom-build-variant-cfg: cross-debug
         mozconfig-variant: debug
     use-sccache: true
     fetches:
         toolchain:
             - linux64-cctools-port
             - linux64-clang-macosx-cross
             - linux64-sccache
-            - macosx64-sdk-11.0
+            - macosx64-sdk-10.12
             - sysroot-wasm32-wasi
     optimization:
         skip-unless-backstop: null
 
 macosx64-gcp/opt:
     description: "MacOS X x64 Cross-compile - built on GCP"
     index:
         job-name: macosx64-gcp-opt
@@ -726,10 +726,10 @@ macosx64-gcp/opt:
             - builds/releng_base_mac_64_cross_builds.py
     run-on-projects: ['mozilla-central']
     use-sccache: true
     fetches:
         toolchain:
             - linux64-cctools-port
             - linux64-clang-macosx-cross
             - linux64-sccache
-            - macosx64-sdk-11.0
+            - macosx64-sdk-10.12
             - sysroot-wasm32-wasi
--- a/taskcluster/ci/instrumented-build/kind.yml
+++ b/taskcluster/ci/instrumented-build/kind.yml
@@ -126,17 +126,17 @@ jobs:
                 - linux64-hfsplus
                 - linux64-libdmg
                 - linux64-rust-macos
                 - linux64-rust-size
                 - linux64-cbindgen
                 - linux64-dump_syms
                 - linux64-nasm
                 - linux64-node
-                - macosx64-sdk-11.0
+                - macosx64-sdk-10.12
                 - sysroot-x86_64-linux-gnu
                 - sysroot-wasm32-wasi
 
     android-x86-shippable/opt:
         description: "Android 5.0 x86 PGO instrumented"
         index:
             product: mobile
             job-name: instrumented-android-x86
--- a/taskcluster/ci/searchfox/kind.yml
+++ b/taskcluster/ci/searchfox/kind.yml
@@ -91,17 +91,17 @@ jobs:
                 - linux64-clang-macosx-cross
                 - linux64-hfsplus
                 - linux64-libdmg
                 - linux64-nasm
                 - linux64-node
                 - linux64-rust-macos
                 - linux64-cbindgen
                 - linux64-dump_syms
-                - macosx64-sdk-11.0
+                - macosx64-sdk-10.12
                 - sysroot-x86_64-linux-gnu
                 - sysroot-wasm32-wasi
 
     win64-searchfox/debug:
         description: "Win64 Searchfox Debug (clang-cl)"
         index:
             job-name: win64-searchfox-debug
         treeherder:
--- a/taskcluster/ci/toolchain/macos-sdk.yml
+++ b/taskcluster/ci/toolchain/macos-sdk.yml
@@ -19,16 +19,25 @@ macosx64-sdk-10.11:
     description: "MacOSX10.11 SDK"
     treeherder:
         symbol: TM(sdk10.11)
     run:
         arguments:
             - /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:
         symbol: TM(sdk11)
     run:
         arguments:
             - /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
--- a/taskcluster/ci/webrender/kind.yml
+++ b/taskcluster/ci/webrender/kind.yml
@@ -108,17 +108,17 @@ jobs:
                   path: /builds/worker/artifacts/wrench-macos-headless.tar.bz2
         dependencies:
             macosx64-clang-13: toolchain-macosx64-clang-13
         fetches:
             toolchain:
                 - linux64-rust-macos
                 - linux64-cctools-port
                 - linux64-clang-13-macosx-cross
-                - macosx64-sdk-11.0
+                - macosx64-sdk-10.12
                 - wrench-deps
             macosx64-clang-13:
                 - artifact: clang.tar.zst
                   dest: clang-mac
         run:
             using: run-task
             command: '$HOME/checkouts/gecko/taskcluster/scripts/misc/wrench-macos-build.sh'
         treeherder:
@@ -168,17 +168,17 @@ jobs:
                 - type: file
                   name: public/build/cargo-test-binaries.tar.bz2
                   path: /builds/worker/artifacts/cargo-test-binaries.tar.bz2
         fetches:
             toolchain:
                 - linux64-rust-macos
                 - linux64-cctools-port
                 - linux64-clang
-                - macosx64-sdk-11.0
+                - macosx64-sdk-10.12
                 - wrench-deps
         run:
             using: run-task
             command: '$HOME/checkouts/gecko/taskcluster/scripts/misc/wr-cargotest-macos-build.sh'
         treeherder:
             platform: osx-cross/debug
             symbol: WR(B)
         when:
--- a/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh
+++ b/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 set -x -e -v
 
 export TARGET_TRIPLE="x86_64-apple-darwin"
 
-MACOS_SYSROOT="${MOZ_FETCHES_DIR}/MacOSX11.0.sdk"
+MACOS_SYSROOT="${MOZ_FETCHES_DIR}/MacOSX10.12.sdk"
 CLANGDIR="${MOZ_FETCHES_DIR}/clang"
 
 # Deploy the wrench dependencies
 mv ${MOZ_FETCHES_DIR}/wrench-deps/{vendor,.cargo} "${GECKO_PATH}/gfx/wr/"
 
 # Building wrench with the `headless` feature also builds the osmesa-src crate,
 # which includes building C++ code. We have to do a bunch of shenanigans
 # to make this cross-compile properly.