Bug 1487330 - Make mozconfig.{asan,lto,tsan} use mozconfig.linux. r=froydnj
☠☠ backed out by 43b1ea339d12 ☠ ☠
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 30 Aug 2018 17:38:43 +0900
changeset 434143 e1eac066705ff183de649f094718a4c114af3826
parent 434142 dd278a6e5c73796f269ff13ec5036da5a0c7813b
child 434144 cd82664c5a141ff4b30f0bd0300f754adee3e262
push id107278
push usermh@glandium.org
push dateThu, 30 Aug 2018 22:51:42 +0000
treeherdermozilla-inbound@e1eac066705f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1487330
milestone63.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 1487330 - Make mozconfig.{asan,lto,tsan} use mozconfig.linux. r=froydnj Those mozconfigs do things in common that are already in mozconfig.linux. Let's just use that. This will make the build have the binutils toolchain in PATH rather than passing it to CC/CXX, which is better because it also makes the build use tools such as ar, ranlib, objcopy from the binutils toolchain, rather than the old system ones. Differential Revision: https://phabricator.services.mozilla.com/D4649
build/unix/mozconfig.asan
build/unix/mozconfig.lto
build/unix/mozconfig.tsan
--- a/build/unix/mozconfig.asan
+++ b/build/unix/mozconfig.asan
@@ -1,27 +1,16 @@
 MOZ_AUTOMATION_L10N_CHECK=0
 
-. "$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"
+. "$topsrcdir/build/unix/mozconfig.linux"
 
-# 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
-
+export LLVM_SYMBOLIZER="$topsrcdir/clang/bin/llvm-symbolizer"
+#
 # 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,24 +1,13 @@
 MOZ_AUTOMATION_L10N_CHECK=0
 
-. "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/unix/mozconfig.linux"
 
 # 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,23 +1,14 @@
 MOZ_AUTOMATION_L10N_CHECK=0
 
-. "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/unix/mozconfig.linux"
 
-# 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
@@ -25,10 +16,8 @@ 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"