--- a/build/unix/mozconfig.asan
+++ b/build/unix/mozconfig.asan
@@ -1,16 +1,27 @@
 MOZ_AUTOMATION_L10N_CHECK=0
 
-. "$topsrcdir/build/unix/mozconfig.linux"
+. "$topsrcdir/build/mozconfig.common"
+
+# Use Clang as specified in manifest
+export CC="$topsrcdir/clang/bin/clang -fgnu89-inline"
+export CXX="$topsrcdir/clang/bin/clang++"
+export LLVM_SYMBOLIZER="$topsrcdir/clang/bin/llvm-symbolizer"
 
-export LLVM_SYMBOLIZER="$topsrcdir/clang/bin/llvm-symbolizer"
-#
+# Use a newer binutils, if it's there
+if [ -e "$topsrcdir/binutils/bin/ld" ]; then
+    export CC="$CC -B $topsrcdir/binutils/bin"
+    export CXX="$CXX -B $topsrcdir/binutils/bin"
+fi
+
 # Enable ASan specific code and build workarounds
 ac_add_options --enable-address-sanitizer
 
 # Mandatory options required for ASan builds (both on Linux and Mac)
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols
 ac_add_options --disable-install-strip
 ac_add_options --disable-jemalloc
 ac_add_options --disable-crashreporter
 ac_add_options --disable-profiling
+
+. "$topsrcdir/build/unix/mozconfig.stdcxx"

--- a/build/unix/mozconfig.lto
+++ b/build/unix/mozconfig.lto
@@ -1,13 +1,24 @@
 MOZ_AUTOMATION_L10N_CHECK=0
 
-. "$topsrcdir/build/unix/mozconfig.linux"
+. "$topsrcdir/build/mozconfig.common"
 
 # Use Clang as specified in manifest
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
+export CC="$topsrcdir/clang/bin/clang"
+export CXX="$topsrcdir/clang/bin/clang++"
+
+# Use a newer binutils, if it's there
+if [ -e "$topsrcdir/binutils/bin/ld" ]; then
+    export CC="$CC -B $topsrcdir/binutils/bin"
+    export CXX="$CXX -B $topsrcdir/binutils/bin"
+fi
+
 ac_add_options --enable-lto
 # Until it's either made the default or we figure a way to remove the
 # copy locations that LTO induces in non-PIE executables.
 ac_add_options --enable-pie
+
+. "$topsrcdir/build/unix/mozconfig.stdcxx"

--- a/build/unix/mozconfig.tsan
+++ b/build/unix/mozconfig.tsan
@@ -1,14 +1,23 @@
 MOZ_AUTOMATION_L10N_CHECK=0
 
-. "$topsrcdir/build/unix/mozconfig.linux"
+. "$topsrcdir/build/mozconfig.common"
 
+# Use Clang as specified in manifest
+export CC="$topsrcdir/clang/bin/clang"
+export CXX="$topsrcdir/clang/bin/clang++"
 export LLVM_SYMBOLIZER="$topsrcdir/clang/bin/llvm-symbolizer"
 
+# Use a newer binutils, if it's there
+if [ -e "$topsrcdir/binutils/bin/ld" ]; then
+    export CC="$CC -B $topsrcdir/binutils/bin"
+    export CXX="$CXX -B $topsrcdir/binutils/bin"
+fi
+
 # Enable TSan specific code and build workarounds
 ac_add_options --enable-thread-sanitizer
 
 # The ThreadSanitizer is not compatible with sandboxing
 # (see bug 1182565)
 ac_add_options --disable-sandbox
 
 # These are required by TSan
@@ -16,8 +25,10 @@ ac_add_options --disable-jemalloc
 ac_add_options --disable-crashreporter
 ac_add_options --disable-elf-hack
 ac_add_options --enable-pie
 
 # Keep symbols to symbolize TSan traces
 ac_add_options --disable-install-strip
 # -gline-tables-only results in significantly smaller binaries.
 ac_add_options --enable-debug-symbols="-gline-tables-only"
+
+. "$topsrcdir/build/unix/mozconfig.stdcxx"