Bug 1373150 - Disable compile environment on l10n builds. r=Callek

--HG--
extra : rebase_source : d28920594023bfdd956d0bbdf385e8d1fafb0656

browser/config/mozconfigs/linux32/l10n-mozconfig

@@ -4,7 +4,7 @@ ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/nightly
 
-. $topsrcdir/build/unix/mozconfig.linux32
+. "$topsrcdir/build/mozconfig.no-compile"
 
 export MOZILLA_OFFICIAL=1
 

browser/config/mozconfigs/linux32/l10n-mozconfig-devedition

@@ -4,7 +4,7 @@ ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/aurora
 
-. $topsrcdir/build/unix/mozconfig.linux32
+. "$topsrcdir/build/mozconfig.no-compile"
 
 export MOZILLA_OFFICIAL=1
 

browser/config/mozconfigs/linux64/l10n-mozconfig

@@ -4,7 +4,7 @@ ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/nightly
 
-. $topsrcdir/build/unix/mozconfig.linux
+. "$topsrcdir/build/mozconfig.no-compile"
 
 export MOZILLA_OFFICIAL=1
 

browser/config/mozconfigs/linux64/l10n-mozconfig-devedition

@@ -4,7 +4,7 @@ ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/aurora
 
-. $topsrcdir/build/unix/mozconfig.linux
+. "$topsrcdir/build/mozconfig.no-compile"
 
 export MOZILLA_OFFICIAL=1
 

browser/config/mozconfigs/macosx64/l10n-mozconfig

@@ -1,5 +1,5 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/macosx/mozconfig.common"
+. "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
@@ -19,4 +19,3 @@ export MOZ_TELEMETRY_REPORTING=1
 mk_add_options AUTOCLOBBER=
 
 . "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"

browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition

@@ -1,5 +1,5 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/macosx/mozconfig.common"
+. "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
@@ -19,4 +19,3 @@ export MOZ_TELEMETRY_REPORTING=1
 mk_add_options AUTOCLOBBER=
 
 . "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"

browser/config/mozconfigs/win32/l10n-mozconfig

@@ -1,8 +1,8 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
+. "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-l10n-base=../../l10n
-ac_add_options --with-windows-version=603
 ac_add_options --with-branding=browser/branding/nightly
 
 export MOZILLA_OFFICIAL=1
@@ -14,6 +14,4 @@ export MOZ_TELEMETRY_REPORTING=1
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
 . "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/win32/l10n-mozconfig-devedition

@@ -1,8 +1,8 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
+. "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-l10n-base=../../l10n
-ac_add_options --with-windows-version=603
 ac_add_options --with-branding=browser/branding/aurora
 
 export MOZILLA_OFFICIAL=1
@@ -14,6 +14,4 @@ export MOZ_TELEMETRY_REPORTING=1
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
 . "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/win64/l10n-mozconfig

@@ -1,9 +1,9 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
+. "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-l10n-base=../../l10n
-ac_add_options --with-windows-version=603
 ac_add_options --with-branding=browser/branding/nightly
 
 export MOZILLA_OFFICIAL=1
@@ -15,6 +15,4 @@ export MOZ_TELEMETRY_REPORTING=1
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
 . "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/win64/l10n-mozconfig-devedition

@@ -1,9 +1,9 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
+. "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-l10n-base=../../l10n
-ac_add_options --with-windows-version=603
 ac_add_options --with-branding=browser/branding/aurora
 
 export MOZILLA_OFFICIAL=1
@@ -15,6 +15,4 @@ export MOZ_TELEMETRY_REPORTING=1
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
 . "$topsrcdir/build/mozconfig.common.override"

build/mozconfig.artifact

@@ -3,12 +3,4 @@
 # Enable the artifact build.
 ac_add_options --enable-artifact-builds
 
-# 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
+. "$topsrcdir/build/mozconfig.no-compile"

build/mozconfig.no-compile

@@ -0,0 +1,11 @@
+ac_add_options --disable-compile-environment
+
+# 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