From ea4d1bdf446c0cfa7f7d0dda5123e693833b8350 Mon Sep 17 00:00:00 2001
From: Noemi Erli <nerli@mozilla.com>
Date: Wed, 22 May 2019 02:40:58 +0300
Subject: [PATCH] Backed out changeset aadea84deaeb (bug 1532329) for
 toolchains bustages CLOSED TREE

---
 taskcluster/ci/toolchain/sccache.yml      | 22 --------
 taskcluster/scripts/misc/build-sccache.sh | 66 ++++++++---------------
 2 files changed, 21 insertions(+), 67 deletions(-)

diff --git a/taskcluster/ci/toolchain/sccache.yml b/taskcluster/ci/toolchain/sccache.yml
index 1c76bc20b16b..a62e0b9ed92c 100644
--- a/taskcluster/ci/toolchain/sccache.yml
+++ b/taskcluster/ci/toolchain/sccache.yml
@@ -24,28 +24,6 @@ linux64-sccache:
         - linux64-rust-1.34
         - linux64-binutils
 
-macosx64-sccache:
-    treeherder:
-        symbol: TM(sccache)
-    worker-type: b-linux
-    worker:
-        max-run-time: 1800
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"
-    run-on-projects:
-        - trunk
-        - try
-    run:
-        arguments: ['x86_64-apple-darwin']
-        tooltool-downloads: internal
-        toolchain-artifact: public/build/sccache2.tar.xz
-    toolchains:
-        - linux64-rust-macos-1.34
-        - linux64-clang-8
-        - linux64-cctools-port
-        - linux64-llvm-dsymutil
-        - linux64-binutils
-
 win64-sccache:
     treeherder:
         symbol: TW64(sccache)
diff --git a/taskcluster/scripts/misc/build-sccache.sh b/taskcluster/scripts/misc/build-sccache.sh
index 7964c1ceab87..f0ff922a48bb 100755
--- a/taskcluster/scripts/misc/build-sccache.sh
+++ b/taskcluster/scripts/misc/build-sccache.sh
@@ -3,7 +3,6 @@ set -x -e -v
 
 # 0.2.8 + a number of changes
 SCCACHE_REVISION=5cbd30684e03cab9c2d1272fdc530fd83b8c903b
-TARGET="$1"
 
 # This script is for building sccache
 
@@ -40,65 +39,42 @@ cd sccache
 
 git checkout $SCCACHE_REVISION
 
+# Link openssl statically so we don't have to bother with different sonames
+# across Linux distributions.  We can't use the system openssl; see the sad
+# story in https://bugzilla.mozilla.org/show_bug.cgi?id=1163171#c26.
 case "$(uname -s)" in
 Linux)
-    if [ "$TARGET" == "x86_64-apple-darwin" ]; then
-        export PATH="$WORKSPACE/build/src/llvm-dsymutil/bin:$PATH"
-        export PATH="$WORKSPACE/build/src/cctools/bin:$PATH"
-        cat >$WORKSPACE/build/src/cross-linker <<EOF
-exec $WORKSPACE/build/src/clang/bin/clang -v \
-  -fuse-ld=$WORKSPACE/build/src/cctools/bin/x86_64-darwin11-ld \
-  -mmacosx-version-min=10.11 \
-  -target $TARGET \
-  -B $WORKSPACE/build/src/cctools/bin \
-  -isysroot $WORKSPACE/build/src/MacOSX10.11.sdk \
-  "\$@"
-EOF
-        chmod +x $WORKSPACE/build/src/cross-linker
-        export RUSTFLAGS="-C linker=$WORKSPACE/build/src/cross-linker"
-        export CC="$WORKSPACE/build/src/clang/bin/clang"
-        cargo build --features "all" --verbose --release --target $TARGET
-    else
-        # Link openssl statically so we don't have to bother with different sonames
-        # across Linux distributions.  We can't use the system openssl; see the sad
-        # story in https://bugzilla.mozilla.org/show_bug.cgi?id=1163171#c26.
-        OPENSSL_TARBALL=openssl-1.1.0g.tar.gz
+    OPENSSL_TARBALL=openssl-1.1.0g.tar.gz
 
-        curl -L -O https://www.openssl.org/source/$OPENSSL_TARBALL
-        cat >$OPENSSL_TARBALL.sha256sum <<EOF
+    curl -L -O https://www.openssl.org/source/$OPENSSL_TARBALL
+cat >$OPENSSL_TARBALL.sha256sum <<EOF
 de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af  openssl-1.1.0g.tar.gz
 EOF
-        cat $OPENSSL_TARBALL.sha256sum
-        sha256sum -c $OPENSSL_TARBALL.sha256sum
+    cat $OPENSSL_TARBALL.sha256sum
+    sha256sum -c $OPENSSL_TARBALL.sha256sum
 
-        tar zxf $OPENSSL_TARBALL
+    tar zxf $OPENSSL_TARBALL
 
-        OPENSSL_BUILD_DIRECTORY=$PWD/ourssl
-        pushd $(basename $OPENSSL_TARBALL .tar.gz)
-        ./Configure --prefix=$OPENSSL_BUILD_DIRECTORY no-shared linux-x86_64
-        make -j `nproc --all`
-        # `make install` installs a *ton* of docs that we don't care about.
-        # Just the software, please.
-        make install_sw
-        popd
-        # We don't need to set OPENSSL_STATIC here, because we only have static
-        # libraries in the directory we are passing.
-        env "OPENSSL_DIR=$OPENSSL_BUILD_DIRECTORY" cargo build --features "all dist-server" --verbose --release
-    fi
+    OPENSSL_BUILD_DIRECTORY=$PWD/ourssl
+    pushd $(basename $OPENSSL_TARBALL .tar.gz)
+    ./Configure --prefix=$OPENSSL_BUILD_DIRECTORY no-shared linux-x86_64
+    make -j `nproc --all`
+    # `make install` installs a *ton* of docs that we don't care about.
+    # Just the software, please.
+    make install_sw
+    popd
 
+    # We don't need to set OPENSSL_STATIC here, because we only have static
+    # libraries in the directory we are passing.
+    env "OPENSSL_DIR=$OPENSSL_BUILD_DIRECTORY" cargo build --features "all dist-server" --verbose --release
     ;;
 MINGW*)
     cargo build --verbose --release --features="dist-client s3 gcs"
     ;;
 esac
 
-SCCACHE_OUT=target/release/sccache*
-if [ -n "$TARGET" ]; then
-    SCCACHE_OUT=target/$TARGET/release/sccache*
-fi
-
 mkdir sccache2
-cp $SCCACHE_OUT sccache2/
+cp target/release/sccache* sccache2/
 tar -acf sccache2.tar.$COMPRESS_EXT sccache2
 mkdir -p $UPLOAD_DIR
 cp sccache2.tar.$COMPRESS_EXT $UPLOAD_DIR