Backed out changeset 78a680cf3b40 (bug 1484897) for build timeouts CLOSED TREE

taskcluster/ci/toolchain/linux.yml

@@ -574,7 +574,6 @@ linux64-sccache:
         toolchain-artifact: public/build/sccache2.tar.xz
     toolchains:
         - linux64-rust-1.28
-        - linux64-binutils
 
 linux64-cbindgen:
     description: "cbindgen toolchain build"

taskcluster/ci/toolchain/windows.yml

@@ -247,7 +247,6 @@ win64-sccache:
         max-run-time: 3600
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/sccache-build.manifest"
-            SCCACHE_REVISION: 1ab9a33e8d328941acc23c74c949b765f975f309
     run:
         using: toolchain-script
         script: build-sccache.sh

taskcluster/scripts/misc/build-sccache.sh

@@ -1,9 +1,8 @@
 #!/bin/bash
 set -x -e -v
 
-# 0.2.7 + a number of changes
-# Individual tasks may override this to build a different revision
-: ${SCCACHE_REVISION:=476d807a0b3c1c31314ea165feea83521d87a17f}
+# 0.2.7 + --coverage suppport
+SCCACHE_REVISION=1ab9a33e8d328941acc23c74c949b765f975f309
 
 # This script is for building sccache
 
@@ -12,7 +11,6 @@ Linux)
     WORKSPACE=$HOME/workspace
     UPLOAD_DIR=$HOME/artifacts
     COMPRESS_EXT=xz
-    PATH="$WORKSPACE/build/src/binutils/bin:$PATH"
     ;;
 MINGW*)
     WORKSPACE=$PWD