Bug 1364428 - Pass LLVM_CONFIG everywhere; r=froydnj
authorBobby Holley <bobbyholley@mozilla.com>
Thu, 18 May 2017 18:39:39 -0400
changeset 407339 18ab60546638300e1eef7057fbfbf8a03cacd5a0
parent 407338 cdab12ab8c24f43beaec71a78f0a7a56683f717a
child 407340 399852d9c94d9345c9be7999f90bde560bc59720
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1364428
milestone55.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 1364428 - Pass LLVM_CONFIG everywhere; r=froydnj
browser/config/mozconfigs/linux64/stylo
browser/config/mozconfigs/linux64/stylo-debug
build/mozconfig.common
--- a/browser/config/mozconfigs/linux64/stylo
+++ b/browser/config/mozconfigs/linux64/stylo
@@ -1,5 +1,3 @@
 . "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
 
-export LLVM_CONFIG="${TOOLTOOL_DIR}/clang/bin/llvm-config"
-
 ac_add_options --enable-stylo
--- a/browser/config/mozconfigs/linux64/stylo-debug
+++ b/browser/config/mozconfigs/linux64/stylo-debug
@@ -1,5 +1,3 @@
 . "$topsrcdir/browser/config/mozconfigs/linux64/debug"
 
-export LLVM_CONFIG="${TOOLTOOL_DIR}/clang/bin/llvm-config"
-
 ac_add_options --enable-stylo
--- a/build/mozconfig.common
+++ b/build/mozconfig.common
@@ -11,16 +11,19 @@
 # of this file.
 
 mk_add_options AUTOCLOBBER=1
 
 ac_add_options --enable-crashreporter
 
 ac_add_options --enable-release
 
+# 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
 MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0}
 
 ac_add_options --enable-js-shell
 
 . "$topsrcdir/build/mozconfig.automation"