From 2989908f9d931c34072de7b829d1bec88b7d2ff0 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 15 Jan 2021 04:25:45 +0000
Subject: [PATCH] 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  | 4 +---
 browser/config/mozconfigs/linux64/plain-opt      | 2 --
 browser/config/mozconfigs/macosx64/code-coverage | 4 +---
 browser/config/mozconfigs/win32/mingwclang       | 2 --
 browser/config/mozconfigs/win64/mingwclang       | 2 --
 browser/config/mozconfigs/win64/plain-opt        | 1 -
 build/mozconfig.rust                             | 2 --
 build/mozconfig.win-common                       | 1 -
 build/unix/mozconfig.stdcxx                      | 2 --
 build/unix/mozconfig.unix                        | 2 --
 10 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/browser/config/mozconfigs/linux64/code-coverage b/browser/config/mozconfigs/linux64/code-coverage
index 6a09fa722030..d04e505dc4fa 100644
--- a/browser/config/mozconfigs/linux64/code-coverage
+++ b/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"
\ No newline at end of file
+export RUSTDOCFLAGS="-Cpanic=abort"
diff --git a/browser/config/mozconfigs/linux64/plain-opt b/browser/config/mozconfigs/linux64/plain-opt
index 77b8811a09e0..e745977233e1 100644
--- a/browser/config/mozconfigs/linux64/plain-opt
+++ b/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"
diff --git a/browser/config/mozconfigs/macosx64/code-coverage b/browser/config/mozconfigs/macosx64/code-coverage
index 2e949e5a7341..93409d1cd3ac 100644
--- a/browser/config/mozconfigs/macosx64/code-coverage
+++ b/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"
\ No newline at end of file
+export RUSTDOCFLAGS="-Cpanic=abort"
diff --git a/browser/config/mozconfigs/win32/mingwclang b/browser/config/mozconfigs/win32/mingwclang
index 2d829a3c4062..9e6c9c0b58ba 100644
--- a/browser/config/mozconfigs/win32/mingwclang
+++ b/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"
diff --git a/browser/config/mozconfigs/win64/mingwclang b/browser/config/mozconfigs/win64/mingwclang
index 224f4e65a0b9..5bd958fa010a 100755
--- a/browser/config/mozconfigs/win64/mingwclang
+++ b/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"
diff --git a/browser/config/mozconfigs/win64/plain-opt b/browser/config/mozconfigs/win64/plain-opt
index 38f2936b0794..6ceaa516f9c5 100644
--- a/browser/config/mozconfigs/win64/plain-opt
+++ b/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"
diff --git a/build/mozconfig.rust b/build/mozconfig.rust
index d12787f11243..369b2f9f634a 100644
--- a/build/mozconfig.rust
+++ b/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"
diff --git a/build/mozconfig.win-common b/build/mozconfig.win-common
index 431abe797ebd..9473c040e6ee 100644
--- a/build/mozconfig.win-common
+++ b/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
diff --git a/build/unix/mozconfig.stdcxx b/build/unix/mozconfig.stdcxx
index b1bb4e27db57..b263668aeaa9 100644
--- a/build/unix/mozconfig.stdcxx
+++ b/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.
diff --git a/build/unix/mozconfig.unix b/build/unix/mozconfig.unix
index 07604c29cc14..bb099ada607d 100644
--- a/build/unix/mozconfig.unix
+++ b/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++"