Bug 1382525 - Move LLVM_CONFIG out of mozconfig.common. r=chmanchester

LLVM_CONFIG, per the contents of toolkit/moz.configure, is tied to --enable-stylo, but it currently is set on all types of builds. It currently happens to work, but it's actually not meant to, and sure enough, the fix for bug 1374727 exacerbates that. So we create a new mozconfig.stylo file that enables stylo and sets LLVM_CONFIG, such that only build types that do enable stylo have LLVM_CONFIG set. --HG-- extra : rebase_source : 01277a79951888046c0b8e29c61cfc3b049ee0f0
dothq · Jul 20, 2017 · 4c6aca3 · 4c6aca3
1 parent 8b22bb2
commit 4c6aca3
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 23 deletions.
diff --git a/browser/config/mozconfigs/linux64/common-opt b/browser/config/mozconfigs/linux64/common-opt
@@ -1,8 +1,6 @@
 # This file is sourced by the nightly, beta, and release mozconfigs.
 
-# TODO remove once configure defaults to stylo once stylo enabled
-# on all platforms.
-ac_add_options --enable-stylo=build
+. $topsrcdir/build/mozconfig.stylo
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-google-api-keyfile=/builds/gapi.data

diff --git a/browser/config/mozconfigs/linux64/debug b/browser/config/mozconfigs/linux64/debug
@@ -2,8 +2,7 @@ ac_add_options --enable-debug
 ac_add_options --enable-dmd
 ac_add_options --enable-verify-mar
 
-# TODO remove once configure defaults to stylo once stylo enabled
-ac_add_options --enable-stylo=build
+. $topsrcdir/build/mozconfig.stylo
 
 MOZ_AUTOMATION_L10N_CHECK=0
 

diff --git a/browser/config/mozconfigs/linux64/debug-static-analysis-clang b/browser/config/mozconfigs/linux64/debug-static-analysis-clang
@@ -9,6 +9,7 @@ ac_add_options --enable-dmd
 
 # Disable stylo until bug 1356926 is fixed and we have >= llvm39 on centos.
 ac_add_options --disable-stylo
+unset LLVM_CONFIG
 
 # Use Clang as specified in manifest
 export CC="$topsrcdir/clang/bin/clang"

diff --git a/browser/config/mozconfigs/linux64/opt-static-analysis-clang b/browser/config/mozconfigs/linux64/opt-static-analysis-clang
@@ -8,6 +8,7 @@ ac_add_options --enable-dmd
 
 # Disable stylo until bug 1356926 is fixed and we have >= llvm39 on centos.
 ac_add_options --disable-stylo
+unset LLVM_CONFIG
 
 # Use Clang as specified in manifest
 CC="$topsrcdir/clang/bin/clang"

diff --git a/browser/config/mozconfigs/linux64/valgrind b/browser/config/mozconfigs/linux64/valgrind
@@ -8,6 +8,7 @@ ac_add_options --disable-gtest-in-build
 # Rust code gives false positives that we have not entirely suppressed yet.
 # Bug 1365915 tracks fixing these.
 ac_add_options --disable-stylo
+unset LLVM_CONFIG
 
 # Include the override mozconfig again (even though the above includes it)
 # since it's supposed to override everything.

diff --git a/browser/config/mozconfigs/win32/common-opt b/browser/config/mozconfigs/win32/common-opt
@@ -1,8 +1,6 @@
 # This file is sourced by the nightly, beta, and release mozconfigs.
 
-# TODO remove once configure defaults to stylo once stylo enabled
-# on all platforms.
-ac_add_options --enable-stylo=build
+. "$topsrcdir/build/mozconfig.stylo"
 
 . "$topsrcdir/browser/config/mozconfigs/common"
 

diff --git a/browser/config/mozconfigs/win32/debug b/browser/config/mozconfigs/win32/debug
@@ -2,9 +2,7 @@
 MOZ_AUTOMATION_L10N_CHECK=0
 . "$topsrcdir/browser/config/mozconfigs/common"
 
-# TODO remove once configure defaults to stylo once stylo enabled
-# on all platforms.
-ac_add_options --enable-stylo=build
+. "$topsrcdir/build/mozconfig.stylo"
 
 ac_add_options --enable-debug
 ac_add_options --enable-dmd

diff --git a/browser/config/mozconfigs/win64/common-opt b/browser/config/mozconfigs/win64/common-opt
@@ -1,8 +1,6 @@
 # This file is sourced by the nightly, beta, and release mozconfigs.
 
-# TODO remove once configure defaults to stylo once stylo enabled
-# on all platforms.
-ac_add_options --enable-stylo=build
+. "$topsrcdir/build/mozconfig.stylo"
 
 . "$topsrcdir/browser/config/mozconfigs/common"
 

diff --git a/browser/config/mozconfigs/win64/debug b/browser/config/mozconfigs/win64/debug
@@ -5,9 +5,7 @@ MOZ_AUTOMATION_L10N_CHECK=0
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
-# TODO remove once configure defaults to stylo once stylo enabled
-# on all platforms.
-ac_add_options --enable-stylo=build
+. "$topsrcdir/build/mozconfig.stylo"
 
 ac_add_options --enable-debug
 ac_add_options --enable-dmd

diff --git a/build/macosx/mozconfig.common b/build/macosx/mozconfig.common
@@ -4,6 +4,4 @@ else
   . $topsrcdir/build/macosx/local-mozconfig.common
 fi
 
-# Enable stylo in automation builds.
-# Can be removed after bug 1375774 is resolved.
-ac_add_options --enable-stylo=build
+. $topsrcdir/build/mozconfig.stylo
diff --git a/build/mozconfig.common b/build/mozconfig.common
@@ -14,9 +14,6 @@ mk_add_options AUTOCLOBBER=1
 
 ac_add_options --enable-crashreporter
 
-# Tell the build system where to find llvm-config for builds on automation.
-export LLVM_CONFIG="${TOOLTOOL_DIR:-$topsrcdir}/clang/bin/llvm-config"
-
 # Enable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-1}
 # Disable enforcing that add-ons are signed by the trusted root

diff --git a/build/mozconfig.no-compile b/build/mozconfig.no-compile
@@ -10,3 +10,4 @@ unset CARGO
 unset MAKECAB
 unset TOOLCHAIN_PREFIX
 unset BINDGEN_CFLAGS
+unset LLVM_CONFIG
diff --git a/build/mozconfig.stylo b/build/mozconfig.stylo
@@ -0,0 +1,6 @@
+# Tell the build system where to find llvm-config for builds on automation.
+export LLVM_CONFIG="${TOOLTOOL_DIR:-$topsrcdir}/clang/bin/llvm-config"
+
+# TODO remove once configure defaults to stylo once stylo enabled
+# on all platforms.
+ac_add_options --enable-stylo=build