Bug 1415057: Disable compiler environment on linux32 L10N repacks. r=me a=jorgk DONTBUILD
authorTom Prince <mozilla@hocat.ca>
Tue, 07 Nov 2017 11:11:18 -0700
changeset 29844 caffea3f41f87014608c38c4c408af56b9a865a1
parent 29843 338a98536049c8c2b406274780e01f0808496938
child 29845 67e7598046eedb1cde7c0484cfa986d0a6447fcb
child 29847 8b24ea7d2e626df034a6f029c1059d135cc7899f
child 30207 247fd3c68094224aebc34cb8363a55063c5b02ed
push id378
push userclokep@gmail.com
push dateMon, 13 Nov 2017 18:45:35 +0000
reviewersme, jorgk
bugs1415057
Bug 1415057: Disable compiler environment on linux32 L10N repacks. r=me a=jorgk DONTBUILD
build/mozconfig.no-compile
mail/config/mozconfigs/linux32/l10n-mozconfig
new file mode 100644
--- /dev/null
+++ b/build/mozconfig.no-compile
@@ -0,0 +1,19 @@
+ac_add_options --disable-compile-environment
+
+# In case mozconfig.cache was already included
+unset CCACHE
+unset SCCACHE_VERBOSE_STATS
+# In case it wasn't
+NO_CACHE=1
+
+# Override any toolchain defines we've inherited from other mozconfigs.
+unset CC
+unset CXX
+unset HOST_CC
+unset HOST_CXX
+unset RUSTC
+unset CARGO
+unset MAKECAB
+unset TOOLCHAIN_PREFIX
+unset BINDGEN_CFLAGS
+unset LLVM_CONFIG
--- a/mail/config/mozconfigs/linux32/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux32/l10n-mozconfig
@@ -2,18 +2,17 @@
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-l10n-base=../../l10n
-# The compile environment is needed for Linux, see bug 1349300 and bug 1311045.
-# ac_add_options --disable-compile-environment
+. $topsrcdir/build/mozconfig.no-compile
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols