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 <$OPENSSL_TARBALL.sha256sum <$OPENSSL_TARBALL.sha256sum <