Bug 1686646 - Remove TOOLTOOL_DIR from mozconfigs where it is unused. r=firefox-build-system-reviewers,dmajor

Differential Revision: https://phabricator.services.mozilla.com/D101711

browser/config/mozconfigs/linux64/code-coverage

@@ -1,7 +1,5 @@
 . "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
 
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-
 ac_add_options --disable-install-strip
 ac_add_options --disable-elf-hack
 ac_add_options --disable-sandbox
@@ -14,4 +12,4 @@ CLANG_LIB_DIR="$(cd $MOZ_FETCHES_DIR/clang/lib/clang/* && cd lib/linux && pwd)"
 export LDFLAGS="--coverage -L$CLANG_LIB_DIR"
 export LIBS="-lclang_rt.profile-x86_64"
 export RUSTFLAGS="-Ccodegen-units=1 -Zprofile -Cpanic=abort -Zpanic_abort_tests -Clink-dead-code -Coverflow-checks=off"
-export RUSTDOCFLAGS="-Cpanic=abort"
+export RUSTDOCFLAGS="-Cpanic=abort"

browser/config/mozconfigs/linux64/plain-opt

@@ -1,5 +1,3 @@
-export TOOLTOOL_DIR="$topsrcdir"
-
 CARGO="${MOZ_FETCHES_DIR}/rustc/bin/cargo"
 RUSTC="${MOZ_FETCHES_DIR}/rustc/bin/rustc"
 RUSTDOC="${MOZ_FETCHES_DIR}/rustc/bin/rustdoc"

browser/config/mozconfigs/macosx64/code-coverage

@@ -1,7 +1,5 @@
 . "$topsrcdir/browser/config/mozconfigs/macosx64/nightly"
 
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-
 ac_add_options --enable-debug-symbols=-g1
 ac_add_options --disable-sandbox
 ac_add_options --disable-warnings-as-errors
@@ -11,4 +9,4 @@ CLANG_LIB_DIR="$(cd $MOZ_FETCHES_DIR/clang/lib/clang/* && cd lib/darwin && pwd)"
 export LDFLAGS="-coverage -L$CLANG_LIB_DIR"
 export LIBS="-lclang_rt.profile_osx"
 export RUSTFLAGS="-Ccodegen-units=1 -Zprofile -Cpanic=abort -Zpanic_abort_tests -Clink-dead-code -Coverflow-checks=off"
-export RUSTDOCFLAGS="-Cpanic=abort"
+export RUSTDOCFLAGS="-Cpanic=abort"

browser/config/mozconfigs/win32/mingwclang

@@ -1,7 +1,6 @@
 # Sets:
 #    MOZ_AUTOMATION flags
 #    SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE - shouldn't be used?
-#    TOOLTOOL_DIR
 . "$topsrcdir/build/mozconfig.win-common"
 
 # Sets:
@@ -15,7 +14,6 @@
 #  build/mozconfig.automation
 #    MOZ_AUTOMATION_ flags
 #  build/mozconfig.rust
-#    TOOLTOOL_DIR
 #    RUSTC
 #    CARGO
 . "$topsrcdir/browser/config/mozconfigs/common"

browser/config/mozconfigs/win64/mingwclang

@@ -1,7 +1,6 @@
 # Sets:
 #    MOZ_AUTOMATION flags
 #    SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE - shouldn't be used?
-#    TOOLTOOL_DIR
 . "$topsrcdir/build/mozconfig.win-common"
 
 # Sets:
@@ -15,7 +14,6 @@
 #  build/mozconfig.automation
 #    MOZ_AUTOMATION_ flags
 #  build/mozconfig.rust
-#    TOOLTOOL_DIR
 #    RUSTC
 #    CARGO
 . "$topsrcdir/browser/config/mozconfigs/common"

browser/config/mozconfigs/win64/plain-opt

@@ -1,4 +1,3 @@
-TOOLTOOL_DIR=${topsrcdir}
 export DUMP_SYMS="${MOZ_FETCHES_DIR}/dump_syms/dump_syms.exe"
 
 RUSTC="${MOZ_FETCHES_DIR}/rustc/bin/rustc"

build/mozconfig.rust

@@ -1,7 +1,5 @@
 # Options to enable rust in automation builds.
 
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-
 # Tell configure to use the tooltool rustc.
 RUSTC="$MOZ_FETCHES_DIR/rustc/bin/rustc"
 CARGO="$MOZ_FETCHES_DIR/rustc/bin/cargo"

build/mozconfig.win-common

@@ -2,7 +2,6 @@
 # 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/.
 
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 export DUMP_SYMS="${MOZ_FETCHES_DIR}/dump_syms/dump_syms"
 
 if [ -z "$USE_ARTIFACT" ]; then

build/unix/mozconfig.stdcxx

@@ -1,8 +1,6 @@
 # Avoid dependency on libstdc++ 4.7
 export MOZ_STDCXX_COMPAT=1
 
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-
 # Depending whether GCC was built on a RedHat-based or a Debian-based system,
 # the directory containing 32-bits libraries can be either (respectively)
 # lib or lib32. The directory for 64-bits libraries is always lib64.

build/unix/mozconfig.unix

@@ -1,7 +1,5 @@
 . "$topsrcdir/build/mozconfig.common"
 
-TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-
 if [ -n "$FORCE_GCC" ]; then
     CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
     CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"