Bug 1413041 - Don't set LLVM_CONFIG on beta and release. r?nalexander draft
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Wed, 01 Nov 2017 17:12:43 +0900
changeset 689936 f8aa4ad7e5ab18a82bb33ebba4bd40ab187080c4
parent 689820 ee21e5f7f1c1726e0ed2697eb45df54cdceedd36
child 738440 073e894ce4c0b2f06cecdfb4c977df36a3e0736f
push id87158
push userbmo:m_kato@ga2.so-net.ne.jp
push dateWed, 01 Nov 2017 08:21:11 +0000
reviewersnalexander
bugs1413041
milestone58.0a1
Bug 1413041 - Don't set LLVM_CONFIG on beta and release. r?nalexander LLVM_CONFIG is only allowed when building stylo. If not building it, it causes invalid option error. mozconfigs doesn't have same value for milestone.is_nightly of moz.configure. So, to detect nightly version, I analyze milestone.txt. MozReview-Commit-ID: Iq1FvxymKEc
mobile/android/config/mozconfigs/common
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -3,17 +3,20 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # This file is included at the top of all native android mozconfigs
 if [ "x$IS_NIGHTLY" = "xyes" ]; then
   MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
 fi
 
 if [ -z "$NO_NDK" ]; then
-  . "$topsrcdir/build/mozconfig.stylo"
+  # MOZ_UPDATE_CHANNEL isn't always set.  It cannot use to detect as trunk.
+  if [ `tail -1 "$topsrcdir/config/milestone.txt" | grep 'a1'` ] ; then
+    . "$topsrcdir/build/mozconfig.stylo"
+  fi
 fi
 
 MOZ_AUTOMATION_L10N_CHECK=0
 . "$topsrcdir/build/mozconfig.common"
 
 # For actual Android builds in TaskCluster, the system image is Debian,
 # and we use the Java JRE/JDK from the system, as well as the system
 # GCC for the host compiler.  l10n builds are still special, however: