Bug 1686646 - In mozconfigs, don't set paths to tools configure can now find on its own. r=firefox-build-system-reviewers,dmajor
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 15 Jan 2021 04:33:09 +0000
changeset 563221 252960b9bd0e916ddff1f346e6be040c3f8a9eef
parent 563220 963f5839789d99180e1ab472029d809f544ff542
child 563222 2b7973c723cc04f07f36b35680ab170e6f9b8ae6
push id38107
push userapavel@mozilla.com
push dateFri, 15 Jan 2021 13:56:45 +0000
treeherdermozilla-central@981e9741e62c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfirefox-build-system-reviewers, dmajor
bugs1686646
milestone86.0a1
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
Bug 1686646 - In mozconfigs, don't set paths to tools configure can now find on its own. r=firefox-build-system-reviewers,dmajor Differential Revision: https://phabricator.services.mozilla.com/D101721
browser/config/mozconfigs/linux32/debug-asan
browser/config/mozconfigs/linux64/asan-fuzzing-ccov
browser/config/mozconfigs/linux64/debug-asan
browser/config/mozconfigs/linux64/debug-searchfox-clang
browser/config/mozconfigs/linux64/debug-static-analysis-clang
browser/config/mozconfigs/linux64/nightly-asan
browser/config/mozconfigs/linux64/nightly-fuzzing-asan
browser/config/mozconfigs/linux64/plain-opt
browser/config/mozconfigs/linux64/tsan
browser/config/mozconfigs/macosx64/plain-opt
browser/config/mozconfigs/win32/common-win32
browser/config/mozconfigs/win32/mingwclang
browser/config/mozconfigs/win64-aarch64/common-win64
browser/config/mozconfigs/win64/common-win64
browser/config/mozconfigs/win64/mingwclang
browser/config/mozconfigs/win64/plain-opt
build/macosx/cross-mozconfig.common
build/macosx/local-mozconfig.common
build/macosx/mozconfig.common
build/mozconfig.cache
build/mozconfig.common
build/mozconfig.nasm
build/mozconfig.no-compile
build/mozconfig.rust
build/mozconfig.wasm-sandboxing
build/mozconfig.win-common
build/unix/mozconfig.linux
build/unix/mozconfig.unix
js/src/devtools/rootAnalysis/mozconfig.browser
js/src/devtools/rootAnalysis/mozconfig.common
js/src/devtools/rootAnalysis/mozconfig.haz_shell
mobile/android/config/mozconfigs/common
--- a/browser/config/mozconfigs/linux32/debug-asan
+++ b/browser/config/mozconfigs/linux32/debug-asan
@@ -4,17 +4,15 @@ ac_add_options --enable-debug
 ac_add_options --enable-optimize="-O1"
 
 # ASan specific options on Linux
 ac_add_options --enable-valgrind
 
 . $topsrcdir/build/unix/mozconfig.asan
 ac_add_options --disable-elf-hack
 
-export DUMP_SYMS="${MOZ_FETCHES_DIR}/dump_syms/dump_syms"
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL=asan
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/asan-fuzzing-ccov
+++ b/browser/config/mozconfigs/linux64/asan-fuzzing-ccov
@@ -8,18 +8,16 @@ MOZ_REQUIRE_SIGNING=0
 . $topsrcdir/build/mozconfig.wasm-sandboxing
 
 # ASan specific options on Linux
 ac_add_options --enable-valgrind
 
 . $topsrcdir/build/unix/mozconfig.asan
 ac_add_options --disable-elf-hack
 
-export DUMP_SYMS="${MOZ_FETCHES_DIR}/dump_syms/dump_syms"
-
 ac_add_options --disable-sandbox
 ac_add_options --disable-profiling
 ac_add_options --disable-warnings-as-errors
 ac_add_options --enable-coverage
 
 export CFLAGS="$CFLAGS --coverage"
 export CXXFLAGS="$CXXFLAGS --coverage"
 export LDFLAGS="$LDFLAGS --coverage -Wl,--compress-debug-sections=zlib"
--- a/browser/config/mozconfigs/linux64/debug-asan
+++ b/browser/config/mozconfigs/linux64/debug-asan
@@ -14,18 +14,16 @@ ac_add_options --disable-elf-hack
 # Build with fuzzing support, so this build can also be used
 # to analyze fuzzing bugs with rr.
 ac_add_options --enable-fuzzing
 
 # Enable ASan for rust code. This is done for specific build tasks rather than
 # globally in mozconfig.asan because it requires an unstable -Z flag.
 export RUSTFLAGS="$RUSTFLAGS -Zsanitizer=address"
 
-export DUMP_SYMS="${MOZ_FETCHES_DIR}/dump_syms/dump_syms"
-
 # Include 'SourceRepository' in application.ini which
 # is used by Pernosco to locate source
 export MOZ_INCLUDE_SOURCE_INFO=1
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 # Need this to prevent name conflicts with the normal nightly build packages
--- a/browser/config/mozconfigs/linux64/debug-searchfox-clang
+++ b/browser/config/mozconfigs/linux64/debug-searchfox-clang
@@ -2,20 +2,16 @@ MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_CHECK=0
 
 . "$topsrcdir/build/unix/mozconfig.unix"
 
 ac_add_options --enable-debug
 
 . $topsrcdir/build/mozconfig.wasm-sandboxing
 
-# Use Clang as specified in manifest
-export CC="$MOZ_FETCHES_DIR/clang/bin/clang"
-export CXX="$MOZ_FETCHES_DIR/clang/bin/clang++"
-
 # Save rust analysis (this requires unlocking the unstable features,
 # which is done in the taskcluster task definition via RUSTC_BOOTSTRAP)
 export RUSTFLAGS="-Zsave-analysis"
 
 # Add the static checker
 ac_add_options --enable-clang-plugin
 ac_add_options --enable-mozsearch-plugin
 
--- a/browser/config/mozconfigs/linux64/debug-static-analysis-clang
+++ b/browser/config/mozconfigs/linux64/debug-static-analysis-clang
@@ -1,18 +1,14 @@
 MOZ_AUTOMATION_BUILD_SYMBOLS=0
 
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-debug
 
 . $topsrcdir/build/mozconfig.wasm-sandboxing
 
-# Use Clang as specified in manifest
-export CC="$MOZ_FETCHES_DIR/clang/bin/clang"
-export CXX="$MOZ_FETCHES_DIR/clang/bin/clang++"
-
 # Add the static checker
 ac_add_options --enable-clang-plugin
 
 . "$topsrcdir/build/unix/mozconfig.stdcxx"
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/nightly-asan
+++ b/browser/config/mozconfigs/linux64/nightly-asan
@@ -9,18 +9,16 @@ ac_add_options --enable-valgrind
 
 . $topsrcdir/build/unix/mozconfig.asan
 ac_add_options --disable-elf-hack
 
 # Enable ASan for rust code. This is done for specific build tasks rather than
 # globally in mozconfig.asan because it requires an unstable -Z flag.
 export RUSTFLAGS="$RUSTFLAGS -Zsanitizer=address"
 
-export DUMP_SYMS="${MOZ_FETCHES_DIR}/dump_syms/dump_syms"
-
 # Piggybacking UBSan for now since only a small subset of checks are enabled.
 # A new build can be created when appropriate.
 ac_add_options --enable-undefined-sanitizer
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 # Need this to prevent name conflicts with the normal nightly build packages
--- a/browser/config/mozconfigs/linux64/nightly-fuzzing-asan
+++ b/browser/config/mozconfigs/linux64/nightly-fuzzing-asan
@@ -12,18 +12,16 @@ ac_add_options --enable-valgrind
 
 . $topsrcdir/build/unix/mozconfig.asan
 ac_add_options --disable-elf-hack
 
 # Enable ASan for rust code. This is done for specific build tasks rather than
 # globally in mozconfig.asan because it requires an unstable -Z flag.
 export RUSTFLAGS="$RUSTFLAGS -Zsanitizer=address"
 
-export DUMP_SYMS="${MOZ_FETCHES_DIR}/dump_syms/dump_syms"
-
 # gold is required for libFuzzer to work properly
 ac_add_options --enable-linker=gold
 
 ac_add_options --enable-fuzzing
 unset MOZ_STDCXX_COMPAT
 
 # Piggybacking UBSan for now since only a small subset of checks are enabled.
 # A new build can be created when appropriate.
--- a/browser/config/mozconfigs/linux64/plain-opt
+++ b/browser/config/mozconfigs/linux64/plain-opt
@@ -1,10 +0,0 @@
-CARGO="${MOZ_FETCHES_DIR}/rustc/bin/cargo"
-RUSTC="${MOZ_FETCHES_DIR}/rustc/bin/rustc"
-RUSTDOC="${MOZ_FETCHES_DIR}/rustc/bin/rustdoc"
-RUSTFMT="${MOZ_FETCHES_DIR}/rustc/bin/rustfmt"
-CBINDGEN="${MOZ_FETCHES_DIR}/cbindgen/cbindgen"
-
-NASM="${MOZ_FETCHES_DIR}/nasm/nasm"
-
-CC="${MOZ_FETCHES_DIR}/clang/bin/clang"
-CXX="${MOZ_FETCHES_DIR}/clang/bin/clang++"
--- a/browser/config/mozconfigs/linux64/tsan
+++ b/browser/config/mozconfigs/linux64/tsan
@@ -2,18 +2,16 @@
 ac_add_options --disable-debug
 ac_add_options --enable-optimize="-O2 -gline-tables-only"
 
 . $topsrcdir/build/mozconfig.wasm-sandboxing
 
 . $topsrcdir/build/unix/mozconfig.tsan
 ac_add_options --disable-elf-hack
 
-export DUMP_SYMS="${MOZ_FETCHES_DIR}/dump_syms/dump_syms"
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL=tsan
 
 # Disable telemetry
 ac_add_options MOZ_TELEMETRY_REPORTING=
--- a/browser/config/mozconfigs/macosx64/plain-opt
+++ b/browser/config/mozconfigs/macosx64/plain-opt
@@ -1,7 +0,0 @@
-CARGO="${MOZ_FETCHES_DIR}/rustc/bin/cargo"
-RUSTC="${MOZ_FETCHES_DIR}/rustc/bin/rustc"
-RUSTDOC="${MOZ_FETCHES_DIR}/rustc/bin/rustdoc"
-RUSTFMT="${MOZ_FETCHES_DIR}/rustc/bin/rustfmt"
-CBINDGEN="${MOZ_FETCHES_DIR}/cbindgen/cbindgen"
-
-NASM="${MOZ_FETCHES_DIR}/nasm/nasm"
--- a/browser/config/mozconfigs/win32/common-win32
+++ b/browser/config/mozconfigs/win32/common-win32
@@ -14,29 +14,18 @@ fi
 export MAKENSISU="${MOZ_FETCHES_DIR}/nsis-3.01/makensis.exe"
 if [ -d "${MAKENSISU%/*}" -a ! -x "${MAKENSISU}" ]; then
     chmod +x "${MAKENSISU}"
 fi
 export UPX="${MOZ_FETCHES_DIR}/upx-3.95-win64/upx.exe"
 if [ -f "${UPX}" ]; then
     chmod +x "${UPX}"
 fi
-export WINE=${MOZ_FETCHES_DIR}/wine/bin/wine64
 mk_add_options "export PATH=${VSPATH}/VC/bin/Hostx64/x86:${MOZ_FETCHES_DIR}/nsis-3.01:${PATH}"
 
 unset VC_PATH
 
 fi
 
-export WINCHECKSEC="${MOZ_FETCHES_DIR}/winchecksec/winchecksec"
-if [ ! -f "${WINCHECKSEC}" ]; then
-    export WINCHECKSEC="${MOZ_FETCHES_DIR}/winchecksec/winchecksec.exe"
-    if [ ! -f "${WINCHECKSEC}" ]; then
-        unset WINCHECKSEC
-    fi
+pdbstr="${MOZ_FETCHES_DIR}/pdbstr/pdbstr.exe"
+if [ -f "${pdbstr}" ]; then
+    chmod +x "${pdbstr}"
 fi
-
-export PDBSTR="${MOZ_FETCHES_DIR}/pdbstr/pdbstr.exe"
-if [ -f "${PDBSTR}" ]; then
-    chmod +x "${PDBSTR}"
-else
-    unset PDBSTR
-fi
--- a/browser/config/mozconfigs/win32/mingwclang
+++ b/browser/config/mozconfigs/win32/mingwclang
@@ -8,19 +8,16 @@
 #    AUTOCLOBBER=1
 #    --enable-crashreporter
 #    --enable-release
 #    MOZ_ADDON_SIGNING
 #    MOZ_REQUIRE_SIGNING
 #    --enable-js-shell
 #  build/mozconfig.automation
 #    MOZ_AUTOMATION_ flags
-#  build/mozconfig.rust
-#    RUSTC
-#    CARGO
 . "$topsrcdir/browser/config/mozconfigs/common"
 
 export MOZ_PACKAGE_JSSHELL=1
 
 # MinGW Stuff
 ac_add_options --target=i686-w64-mingw32
 ac_add_options --with-toolchain-prefix=i686-w64-mingw32-
 
--- a/browser/config/mozconfigs/win64-aarch64/common-win64
+++ b/browser/config/mozconfigs/win64-aarch64/common-win64
@@ -14,30 +14,19 @@ fi
 export MAKENSISU="${MOZ_FETCHES_DIR}/nsis-3.01/makensis.exe"
 if [ -d "${MAKENSISU%/*}" -a ! -x "${MAKENSISU}" ]; then
     chmod +x "${MAKENSISU}"
 fi
 export UPX="${MOZ_FETCHES_DIR}/upx-3.95-win64/upx.exe"
 if [ -f "${UPX}" ]; then
     chmod +x "${UPX}"
 fi
-export WINE=${MOZ_FETCHES_DIR}/wine/bin/wine64
 mk_add_options "export PATH=${VSPATH}/VC/bin/Hostx64/arm64:${MOZ_FETCHES_DIR}/nsis-3.01:${PATH}"
 mk_add_options "export WINEPATH=${VSPATH}/VC/bin/Hostx64/x64"
 
 unset VC_PATH
 
 fi
 
-export WINCHECKSEC="${MOZ_FETCHES_DIR}/winchecksec/winchecksec"
-if [ ! -f "${WINCHECKSEC}" ]; then
-    export WINCHECKSEC="${MOZ_FETCHES_DIR}/winchecksec/winchecksec.exe"
-    if [ ! -f "${WINCHECKSEC}" ]; then
-        unset WINCHECKSEC
-    fi
+pdbstr="${MOZ_FETCHES_DIR}/pdbstr/pdbstr.exe"
+if [ -f "${pdbstr}" ]; then
+    chmod +x "${pdbstr}"
 fi
-
-export PDBSTR="${MOZ_FETCHES_DIR}/pdbstr/pdbstr.exe"
-if [ -f "${PDBSTR}" ]; then
-    chmod +x "${PDBSTR}"
-else
-    unset PDBSTR
-fi
--- a/browser/config/mozconfigs/win64/common-win64
+++ b/browser/config/mozconfigs/win64/common-win64
@@ -14,29 +14,18 @@ fi
 export MAKENSISU="${MOZ_FETCHES_DIR}/nsis-3.01/makensis.exe"
 if [ -d "${MAKENSISU%/*}" -a ! -x "${MAKENSISU}" ]; then
     chmod +x "${MAKENSISU}"
 fi
 export UPX="${MOZ_FETCHES_DIR}/upx-3.95-win64/upx.exe"
 if [ -f "${UPX}" ]; then
     chmod +x "${UPX}"
 fi
-export WINE=${MOZ_FETCHES_DIR}/wine/bin/wine64
 mk_add_options "export PATH=${VSPATH}/VC/bin/Hostx64/x64:${MOZ_FETCHES_DIR}/nsis-3.01:${PATH}"
 
 unset VC_PATH
 
 fi
 
-export WINCHECKSEC="${MOZ_FETCHES_DIR}/winchecksec/winchecksec"
-if [ ! -f "${WINCHECKSEC}" ]; then
-    export WINCHECKSEC="${MOZ_FETCHES_DIR}/winchecksec/winchecksec.exe"
-    if [ ! -f "${WINCHECKSEC}" ]; then
-        unset WINCHECKSEC
-    fi
+export pdbstr="${MOZ_FETCHES_DIR}/pdbstr/pdbstr.exe"
+if [ -f "${pdbstr}" ]; then
+    chmod +x "${pdbstr}"
 fi
-
-export PDBSTR="${MOZ_FETCHES_DIR}/pdbstr/pdbstr.exe"
-if [ -f "${PDBSTR}" ]; then
-    chmod +x "${PDBSTR}"
-else
-    unset PDBSTR
-fi
--- a/browser/config/mozconfigs/win64/mingwclang
+++ b/browser/config/mozconfigs/win64/mingwclang
@@ -8,19 +8,16 @@
 #    AUTOCLOBBER=1
 #    --enable-crashreporter
 #    --enable-release
 #    MOZ_ADDON_SIGNING
 #    MOZ_REQUIRE_SIGNING
 #    --enable-js-shell
 #  build/mozconfig.automation
 #    MOZ_AUTOMATION_ flags
-#  build/mozconfig.rust
-#    RUSTC
-#    CARGO
 . "$topsrcdir/browser/config/mozconfigs/common"
 
 export MOZ_PACKAGE_JSSHELL=1
 
 # MinGW Stuff
 ac_add_options --target=x86_64-w64-mingw32
 ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32-
 
--- a/browser/config/mozconfigs/win64/plain-opt
+++ b/browser/config/mozconfigs/win64/plain-opt
@@ -1,14 +1,3 @@
-export DUMP_SYMS="${MOZ_FETCHES_DIR}/dump_syms/dump_syms.exe"
-
-RUSTC="${MOZ_FETCHES_DIR}/rustc/bin/rustc"
-CARGO="${MOZ_FETCHES_DIR}/rustc/bin/cargo"
-RUSTDOC="${MOZ_FETCHES_DIR}/rustc/bin/rustdoc"
-RUSTFMT="${MOZ_FETCHES_DIR}/rustc/bin/rustfmt"
-CBINDGEN="${MOZ_FETCHES_DIR}/cbindgen/cbindgen"
-
-NASM="${MOZ_FETCHES_DIR}/nasm/nasm.exe"
-WINCHECKSEC="${MOZ_FETCHES_DIR}/winchecksec/winchecksec.exe"
-
 ac_add_options --target=x86_64-pc-mingw32
 
 . $topsrcdir/build/win64/mozconfig.vs-latest
--- a/build/macosx/cross-mozconfig.common
+++ b/build/macosx/cross-mozconfig.common
@@ -13,26 +13,23 @@ mk_add_options "export LD_LIBRARY_PATH=$
 # This SDK was copied from a local XCode install and uploaded to tooltool.
 # Generate the tarball by running this command with the proper SDK version:
 #   sdk_path=$(xcrun --sdk macosx10.12 --show-sdk-path)
 #   tar -C $(dirname ${sdk_path}) -cHjf /tmp/$(basename ${sdk_path}).tar.bz2 $(basename ${sdk_path})
 # Upload the resulting tarball from /tmp to tooltool, and change the entry in
 # `browser/config/tooltool-manifests/macosx64/cross-releng.manifest`.
 CROSS_SYSROOT=$topsrcdir/MacOSX10.12.sdk
 
-export CC="$MOZ_FETCHES_DIR/clang/bin/clang"
-export CXX="$MOZ_FETCHES_DIR/clang/bin/clang++"
 export CFLAGS="$CFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}"
 export CXXFLAGS="$CXXFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}"
 export DSYMUTIL=$topsrcdir/build/macosx/llvm-dsymutil
 mk_add_options "export REAL_DSYMUTIL=$MOZ_FETCHES_DIR/llvm-dsymutil/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
-export DUMP_SYMS="$MOZ_FETCHES_DIR/dump_syms/dump_syms"
 
 export HOST_CFLAGS="-g"
 export HOST_CXXFLAGS="-g"
 export HOST_LDFLAGS="-g"
 
 ac_add_options --target=x86_64-apple-darwin
 export MACOS_SDK_DIR=$CROSS_SYSROOT
 
--- a/build/macosx/local-mozconfig.common
+++ b/build/macosx/local-mozconfig.common
@@ -1,18 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 . "$topsrcdir/build/mozconfig.common"
 
 if [ -d "$MOZ_FETCHES_DIR/clang" ]; then
     # mozilla-central based build
-    export CC=$MOZ_FETCHES_DIR/clang/bin/clang
-    export CXX=$MOZ_FETCHES_DIR/clang/bin/clang++
     export DSYMUTIL=$MOZ_FETCHES_DIR/clang/bin/llvm-dsymutil
     # Use an updated linker.
     ldflags="-B$MOZ_FETCHES_DIR/cctools/bin"
     export AR=$MOZ_FETCHES_DIR/cctools/bin/ar
 fi
 
 # Ensure the updated linker doesn't generate things our older build tools
 # don't understand.
@@ -23,10 +21,8 @@ export LDFLAGS="$ldflags"
 if [ -z "$CC" ]; then
     export CC=clang
 fi
 
 # If not set use the system default clang++
 if [ -z "$CXX" ]; then
     export CXX=clang++
 fi
-
-export DUMP_SYMS="$MOZ_FETCHES_DIR/dump_syms/dump_syms"
--- a/build/macosx/mozconfig.common
+++ b/build/macosx/mozconfig.common
@@ -1,16 +1,15 @@
 if test `uname -s` = Linux; then
   . $topsrcdir/build/macosx/cross-mozconfig.common
 else
   . $topsrcdir/build/macosx/local-mozconfig.common
 fi
 
 if [ -z "$USE_ARTIFACT" ]; then
     if [ -n "$TASKCLUSTER_PGO_PROFILE_USE" ]; then
-        export LLVM_PROFDATA="$MOZ_FETCHES_DIR/clang/bin/llvm-profdata"
         export MOZ_LTO=cross
         ac_add_options --enable-profile-use=cross
         ac_add_options --with-pgo-jarlog=${MOZ_FETCHES_DIR}/en-US.log
         ac_add_options --with-pgo-profile-path=${MOZ_FETCHES_DIR}/merged.profdata
     fi
 fi
 
--- a/build/mozconfig.cache
+++ b/build/mozconfig.cache
@@ -71,14 +71,14 @@ if test -n "$bucket"; then
         mk_add_options "export SCCACHE_GCS_CREDENTIALS_URL=http://taskcluster/auth/v1/gcp/credentials/$SCCACHE_GCS_PROJECT/${bucket}@$SCCACHE_GCS_PROJECT.iam.gserviceaccount.com"
     elif [ -n "${SCCACHE_GCS_KEY_PATH}" ]; then
         mk_add_options "export SCCACHE_GCS_BUCKET=$bucket"
     else
         mk_add_options "export SCCACHE_BUCKET=$bucket"
         # instruct sccache to fetch the credentials from the Auth service's awsS3Credentials endpoint, via the Taskcluster proxy.
         mk_add_options "export AWS_IAM_CREDENTIALS_URL=http://taskcluster/auth/v1/aws/s3/read-write/${bucket}/?format=iam-role-compat"
     fi
-    export CCACHE="$MOZ_FETCHES_DIR/sccache/sccache"
+    export CCACHE="sccache"
     export SCCACHE_VERBOSE_STATS=1
     # Workaround for https://github.com/mozilla/sccache/issues/459#issuecomment-618756635
     mk_add_options "export SCCACHE_MAX_FRAME_LENGTH=50000000"
     mk_add_options MOZBUILD_MANAGE_SCCACHE_DAEMON=${MOZ_FETCHES_DIR}/sccache/sccache
 fi
--- a/build/mozconfig.common
+++ b/build/mozconfig.common
@@ -18,12 +18,11 @@ mk_add_options AUTOCLOBBER=1
 
 ac_add_options --enable-crashreporter
 
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0}
 
 ac_add_options --enable-js-shell
 
-. "$topsrcdir/build/mozconfig.nasm"
 . "$topsrcdir/build/mozconfig.automation"
 . "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.cache"
deleted file mode 100644
--- a/build/mozconfig.nasm
+++ /dev/null
@@ -1,12 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-case "$(uname -s)" in
-MINGW*)
-    export NASM=$MOZ_FETCHES_DIR/nasm/nasm.exe
-    ;;
-*)
-    export NASM=$MOZ_FETCHES_DIR/nasm/nasm
-    ;;
-esac
--- a/build/mozconfig.no-compile
+++ b/build/mozconfig.no-compile
@@ -7,42 +7,27 @@ unset SCCACHE_VERBOSE_STATS
 NO_CACHE=1
 
 # Override any toolchain defines we've inherited from other mozconfigs.
 unset CC
 unset CXX
 unset HOST_CC
 unset HOST_CXX
 unset LINKER
-unset RUSTC
 unset RUSTFLAGS
-unset CARGO
-unset RUSTDOC
-unset RUSTFMT
-unset CBINDGEN
-unset DUMP_SYMS
 unset TOOLCHAIN_PREFIX
 unset BINDGEN_CFLAGS
-unset LLVM_PROFDATA
 unset ENABLE_CLANG_PLUGIN
 unset MACOS_SDK_DIR
 unset MACOS_PRIVATE_FRAMEWORKS_DIR
 unset DIA_SDK_PATH
 unset VC_PATH
 unset WINDOWSSDKDIR
 unset MOZ_LTO
 
 unset MOZ_STDCXX_COMPAT
 unset MOZ_NO_PIE_COMPAT
 
-unset NASM
-
 # Don't unset this on Linux artifact builds so the artifact builds correctly
 # package any Wasm sandboxed shared libraries.
 if test `uname -s` != Linux; then
   unset WASM_SANDBOXED_LIBRARIES
 fi
-unset WASM_CC
-unset WASM_CXX
-unset LUCETC
-unset WASI_SYSROOT
-unset PDBSTR
-unset WINCHECKSEC
--- a/build/mozconfig.rust
+++ b/build/mozconfig.rust
@@ -1,10 +1,1 @@
-# Options to enable rust in automation builds.
-
-# Tell configure to use the tooltool rustc.
-RUSTC="$MOZ_FETCHES_DIR/rustc/bin/rustc"
-CARGO="$MOZ_FETCHES_DIR/rustc/bin/cargo"
-RUSTDOC="$MOZ_FETCHES_DIR/rustc/bin/rustdoc"
-RUSTFMT="$MOZ_FETCHES_DIR/rustc/bin/rustfmt"
-CBINDGEN="$MOZ_FETCHES_DIR/cbindgen/cbindgen"
-
 ac_add_options --enable-rust-simd
--- a/build/mozconfig.wasm-sandboxing
+++ b/build/mozconfig.wasm-sandboxing
@@ -1,13 +1,9 @@
 # Tell the build system about bits to build sandboxed wasm libraries.
 case "$PERFHERDER_EXTRA_OPTIONS" in
 base-toolchains*)
     # Clang versions < 8.0 don't support wasm.
     ;;
 *)
     export WASM_SANDBOXED_LIBRARIES=graphite,ogg
-    export WASM_CC="${MOZ_FETCHES_DIR}/clang/bin/clang --target=wasm32-wasi"
-    export WASM_CXX="${MOZ_FETCHES_DIR}/clang/bin/clang++ --target=wasm32-wasi"
-    export LUCETC="${MOZ_FETCHES_DIR}/lucetc/lucetc"
-    export WASI_SYSROOT="${MOZ_FETCHES_DIR}/wasi-sysroot/share/wasi-sysroot"
     ;;
 esac
--- a/build/mozconfig.win-common
+++ b/build/mozconfig.win-common
@@ -1,14 +1,12 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-export DUMP_SYMS="${MOZ_FETCHES_DIR}/dump_syms/dump_syms"
-
 if [ -z "$USE_ARTIFACT" ]; then
     if [ -n "$TASKCLUSTER_PGO_PROFILE_USE" ]; then
         export MOZ_LTO=cross
         ac_add_options --enable-profile-use=cross
         ac_add_options --with-pgo-jarlog="${MOZ_FETCHES_DIR}/en-US.log"
         ac_add_options --with-pgo-profile-path="${MOZ_FETCHES_DIR}/merged.profdata"
     fi
 fi
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -1,12 +1,10 @@
 . "$topsrcdir/build/unix/mozconfig.unix"
 
-export DUMP_SYMS="${MOZ_FETCHES_DIR}/dump_syms/dump_syms"
-
 case "$PERFHERDER_EXTRA_OPTIONS" in
 base-toolchains*)
   # We don't build against wayland for base-toolchain builds.
   ;;
 *)
   ac_add_options --enable-default-toolkit=cairo-gtk3-wayland
   ;;
 esac
--- a/build/unix/mozconfig.unix
+++ b/build/unix/mozconfig.unix
@@ -4,19 +4,16 @@ if [ -n "$FORCE_GCC" ]; then
     CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
     CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
 
     # We want to make sure we use binutils and other binaries in the tooltool
     # package.
     mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
     ac_add_options --with-clang-path=$MOZ_FETCHES_DIR/clang/bin/clang
 else
-    CC="$MOZ_FETCHES_DIR/clang/bin/clang"
-    CXX="$MOZ_FETCHES_DIR/clang/bin/clang++"
-
     # For some builds we don't want to have Clang based static-analysis activated
     if [ -z "$DISABLE_CLANG_PLUGIN" ]; then
         export ENABLE_CLANG_PLUGIN=1
     fi
 
     case "$PERFHERDER_EXTRA_OPTIONS" in
     base-toolchains*)
       # Clang versions < 7.0 don't support the -fcrash-diagnostics-dir flag.
@@ -28,16 +25,15 @@ else
     esac
 
     if [ -z "$USE_ARTIFACT" ]; then
         if [ -n "$TASKCLUSTER_PGO_PROFILE_USE" ]; then
             export MOZ_LTO=cross
             ac_add_options --enable-profile-use=cross
             ac_add_options --with-pgo-jarlog=${MOZ_FETCHES_DIR}/en-US.log
             ac_add_options --with-pgo-profile-path=${MOZ_FETCHES_DIR}/merged.profdata
-            export LLVM_PROFDATA="$MOZ_FETCHES_DIR/clang/bin/llvm-profdata"
         fi
     fi
 
     mk_add_options "export PATH=$MOZ_FETCHES_DIR/binutils/bin:$PATH"
 fi
 
 . "$topsrcdir/build/unix/mozconfig.stdcxx"
--- a/js/src/devtools/rootAnalysis/mozconfig.browser
+++ b/js/src/devtools/rootAnalysis/mozconfig.browser
@@ -5,13 +5,8 @@
 # This mozconfig is used when analyzing the source code of the Firefox browser
 # for GC rooting hazards. See
 # <https://wiki.mozilla.org/Javascript:SpiderMonkey:ExactStackRooting>.
 
 ac_add_options --enable-application=browser
 ac_add_options --enable-js-shell
 
 . $topsrcdir/js/src/devtools/rootAnalysis/mozconfig.common
-
-if [ -n "$AUTOMATION" ]; then
-    export CBINDGEN="${MOZ_FETCHES_DIR}/cbindgen/cbindgen"
-    export NASM="${MOZ_FETCHES_DIR}/nasm/nasm"
-fi
--- a/js/src/devtools/rootAnalysis/mozconfig.common
+++ b/js/src/devtools/rootAnalysis/mozconfig.common
@@ -32,15 +32,10 @@ ac_add_options --disable-replace-malloc
 # -Wignored-attributes is very verbose due to attributes being
 # ignored on template parameters.
 ANALYSIS_EXTRA_CFLAGS="-Wno-attributes -Wno-ignored-attributes"
 CFLAGS="$CFLAGS $ANALYSIS_EXTRA_CFLAGS"
 CPPFLAGS="$CPPFLAGS $ANALYSIS_EXTRA_CFLAGS"
 CXXFLAGS="$CXXFLAGS $ANALYSIS_EXTRA_CFLAGS"
 
 if [ -n "$AUTOMATION" ]; then
-    export CARGO="${MOZ_FETCHES_DIR}/rustc/bin/cargo"
-    export RUSTC="${MOZ_FETCHES_DIR}/rustc/bin/rustc"
-    export RUSTDOC="${MOZ_FETCHES_DIR}/rustc/bin/rustdoc"
-    export RUSTFMT="${MOZ_FETCHES_DIR}/rustc/bin/rustfmt"
-
     ac_add_options --with-clang-path="${MOZ_FETCHES_DIR}/clang/bin/clang"
 fi
--- a/js/src/devtools/rootAnalysis/mozconfig.haz_shell
+++ b/js/src/devtools/rootAnalysis/mozconfig.haz_shell
@@ -8,16 +8,11 @@
 
 ac_add_options --enable-ctypes
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --enable-application=js
 ac_add_options --enable-nspr-build
 
 if [ -n "$AUTOMATION" ]; then
-  export CARGO="${MOZ_FETCHES_DIR}/rustc/bin/cargo"
-  export RUSTC="${MOZ_FETCHES_DIR}/rustc/bin/rustc"
-  export RUSTDOC="${MOZ_FETCHES_DIR}/rustc/bin/rustdoc"
-  export RUSTFMT="${MOZ_FETCHES_DIR}/rustc/bin/rustfmt"
-
   mk_add_options MOZ_OBJDIR="${HAZARD_SHELL_OBJDIR}"
   ac_add_options --with-clang-path="${MOZ_FETCHES_DIR}/clang/bin/clang"
 fi
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -1,53 +1,38 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 . "$topsrcdir/build/mozconfig.common"
 
-# For Android builds in TaskCluster, the system image is Debian, and
-# we use the Java JRE/JDK from the system.  We use a custom clang for
-# the host compiler. Make sure clang uses the c++ headers included with
-# clang, rather than the system headers which leads to incompatibility
-# later (when linking against the clang-provided libstdc++).
-HOST_CC="$MOZ_FETCHES_DIR/clang/bin/clang --gcc-toolchain=$MOZ_FETCHES_DIR/clang"
-HOST_CXX="$MOZ_FETCHES_DIR/clang/bin/clang++ --gcc-toolchain=$MOZ_FETCHES_DIR/clang"
-
 # Build Fennec
 ac_add_options --enable-application=mobile/android
-ac_add_options --with-android-sdk="$MOZ_FETCHES_DIR/android-sdk-linux"
 
 ac_add_options --with-gradle="$MOZ_FETCHES_DIR/android-gradle-dependencies/gradle-dist/bin/gradle"
 export GRADLE_MAVEN_REPOSITORIES="file://$MOZ_FETCHES_DIR/android-gradle-dependencies/google","file://$MOZ_FETCHES_DIR/android-gradle-dependencies/jcenter","file://$MOZ_FETCHES_DIR/android-gradle-dependencies/gradle-plugins"
 
 if [ -z "$NO_NDK" -a -z "$USE_ARTIFACT" ]; then
-    # We use our own clang instead of the NDK's clang.
-    CC="$MOZ_FETCHES_DIR/clang/bin/clang"
-    CXX="$MOZ_FETCHES_DIR/clang/bin/clang++"
     CFLAGS="$CFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}"
     CXXFLAGS="$CXXFLAGS -fcrash-diagnostics-dir=${UPLOAD_PATH}"
-    ac_add_options --with-android-ndk="$MOZ_FETCHES_DIR/android-ndk"
     # Make sure that any host binaries we build use whatever libraries clang
     # linked against, rather than what's on the system.
     mk_add_options "export LD_LIBRARY_PATH=$MOZ_FETCHES_DIR/clang/lib"
-    export DUMP_SYMS="$MOZ_FETCHES_DIR/dump_syms/dump_syms"
     # Enable static analysis plugin
     export ENABLE_CLANG_PLUGIN=1
 fi
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 ac_add_options --with-google-safebrowsing-api-keyfile=/builds/sb-gapi.data
 ac_add_options --with-google-location-service-api-keyfile=/builds/gls-gapi.data
 ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-fennec-geoloc-api.key
 
 if [ -n "$TASKCLUSTER_PGO_PROFILE_USE" -a -z "$USE_ARTIFACT" ]; then
     export MOZ_LTO=cross
-    export LLVM_PROFDATA="$MOZ_FETCHES_DIR/clang/bin/llvm-profdata"
 
     ac_add_options --enable-profile-use=cross
 
     # This is disabled because jarlog re-ordering breaks apk publishing tasks,
     # see bug 1539933.
     # ac_add_options --with-pgo-jarlog=${MOZ_FETCHES_DIR}/en-US.log
     ac_add_options --with-pgo-profile-path=${MOZ_FETCHES_DIR}/merged.profdata
 fi