Commit 376fd536 authored by Marian-Vasile Laza's avatar Marian-Vasile Laza
Browse files

Backed out changeset a899281204c7 (bug 1696504) for causing GTest failures.

parent aab7891e

build/macosx/cross-mozconfig.common

+1 −1
Original line number Diff line number Diff line
@@ -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/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}"

taskcluster/ci/build/macosx.yml

+12 −12
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ macosx64/debug: 
            - linux64-cctools-port

            - linux64-clang-macosx-cross

            - linux64-sccache

            - macosx64-sdk-11.0

            - macosx64-sdk-10.12

            - sysroot-wasm32-wasi



macosx64-hybrid/plain:
@@ -82,7 +82,7 @@ macosx64-hybrid/plain: 
            - linux64-cctools-port

            - linux64-clang-macosx-cross

            - linux64-sccache

            - macosx64-sdk-11.0

            - macosx64-sdk-10.12

            - sysroot-wasm32-wasi



macosx64/opt:
@@ -111,7 +111,7 @@ macosx64/opt: 
            - linux64-cctools-port

            - linux64-clang-macosx-cross

            - linux64-sccache

            - macosx64-sdk-11.0

            - macosx64-sdk-10.12

            - sysroot-wasm32-wasi



macosx64-asan-fuzzing/opt:
@@ -138,7 +138,7 @@ macosx64-asan-fuzzing/opt: 
            - 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
@@ -168,7 +168,7 @@ macosx64-fuzzing/debug: 
            - 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
@@ -206,7 +206,7 @@ macosx64-x64-devedition/opt: 
        toolchain:

            - linux64-cctools-port

            - linux64-clang-macosx-cross

            - macosx64-sdk-11.0

            - macosx64-sdk-10.12

            - sysroot-wasm32-wasi



macosx64-aarch64-devedition/opt:
@@ -410,7 +410,7 @@ macosx64-noopt/debug: 
            - 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:
@@ -436,7 +436,7 @@ macosx64-add-on-devel/opt: 
            - linux64-cctools-port

            - linux64-clang-macosx-cross

            - linux64-sccache

            - macosx64-sdk-11.0

            - macosx64-sdk-10.12

            - sysroot-wasm32-wasi



macosx64-x64-shippable/opt:
@@ -468,7 +468,7 @@ macosx64-x64-shippable/opt: 
        toolchain:

            - linux64-cctools-port

            - linux64-clang-macosx-cross

            - macosx64-sdk-11.0

            - macosx64-sdk-10.12

            - sysroot-wasm32-wasi



macosx64-aarch64-shippable/opt:
@@ -670,7 +670,7 @@ macosx64-ccov/opt: 
            - linux64-cctools-port

            - linux64-clang-macosx-cross

            - linux64-sccache

            - macosx64-sdk-11.0

            - macosx64-sdk-10.12

            - sysroot-wasm32-wasi



macosx64-gcp/debug:
@@ -700,7 +700,7 @@ macosx64-gcp/debug: 
            - 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
@@ -731,5 +731,5 @@ macosx64-gcp/opt: 
            - linux64-cctools-port

            - linux64-clang-macosx-cross

            - linux64-sccache

            - macosx64-sdk-11.0

            - macosx64-sdk-10.12

            - sysroot-wasm32-wasi

taskcluster/ci/instrumented-build/kind.yml

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ jobs: 
                - linux64-dump_syms

                - linux64-nasm

                - linux64-node

                - macosx64-sdk-11.0

                - macosx64-sdk-10.12

                - sysroot-x86_64-linux-gnu

                - sysroot-wasm32-wasi

taskcluster/ci/searchfox/kind.yml

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ jobs: 
                - linux64-rust-macos

                - linux64-cbindgen

                - linux64-dump_syms

                - macosx64-sdk-11.0

                - macosx64-sdk-10.12

                - sysroot-x86_64-linux-gnu

                - sysroot-wasm32-wasi

taskcluster/ci/toolchain/macos-sdk.yml

+9 −0
Original line number Diff line number Diff line
@@ -24,6 +24,15 @@ 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: