Bug 1373150 - Disable compile environment on l10n builds. r=Callek
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 15 Jun 2017 15:06:45 +0900
changeset 364447 943dc0fef2638e9fe70b8328e2b67e057210358f
parent 364446 68f8468766e7b15e5eeb94d1031940e34a8df29d
child 364448 274e6b6d1399b1d1e042b4150b6704d537bc1a60
push id32042
push userarchaeopteryx@coole-files.de
push dateSat, 17 Jun 2017 19:33:32 +0000
treeherdermozilla-central@24012764504b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs1373150
milestone56.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 1373150 - Disable compile environment on l10n builds. r=Callek
browser/config/mozconfigs/linux32/l10n-mozconfig
browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
browser/config/mozconfigs/linux64/l10n-mozconfig
browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
browser/config/mozconfigs/macosx64/l10n-mozconfig
browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
browser/config/mozconfigs/win32/l10n-mozconfig
browser/config/mozconfigs/win32/l10n-mozconfig-devedition
browser/config/mozconfigs/win64/l10n-mozconfig
browser/config/mozconfigs/win64/l10n-mozconfig-devedition
build/mozconfig.artifact
build/mozconfig.no-compile
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,15 +1,15 @@
 no_sccache=1
 
 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
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --disable-stdcxx-compat
 
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
@@ -1,15 +1,15 @@
 no_sccache=1
 
 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
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --disable-stdcxx-compat
 
--- a/browser/config/mozconfigs/linux64/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,15 +1,15 @@
 no_sccache=1
 
 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
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --disable-stdcxx-compat
 
--- a/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
@@ -1,15 +1,15 @@
 no_sccache=1
 
 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
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 ac_add_options --disable-stdcxx-compat
 
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@@ -1,10 +1,10 @@
 . "$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}
 ac_add_options --with-branding=browser/branding/nightly
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
@@ -14,9 +14,8 @@ export MOZILLA_OFFICIAL=1
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 . "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
@@ -1,10 +1,10 @@
 . "$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}
 ac_add_options --with-branding=browser/branding/aurora
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
@@ -14,9 +14,8 @@ export MOZILLA_OFFICIAL=1
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
 . "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/win32/l10n-mozconfig
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig
@@ -1,19 +1,17 @@
 . "$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
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win32/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig-devedition
@@ -1,19 +1,17 @@
 . "$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
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/l10n-mozconfig
+++ b/browser/config/mozconfigs/win64/l10n-mozconfig
@@ -1,20 +1,18 @@
 . "$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
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/win64/l10n-mozconfig-devedition
@@ -1,20 +1,18 @@
 . "$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
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=
 
-. $topsrcdir/build/win64/mozconfig.vs-latest
-
 . "$topsrcdir/build/mozconfig.common.override"
--- a/build/mozconfig.artifact
+++ b/build/mozconfig.artifact
@@ -1,14 +1,6 @@
 # Common options for testing artifact builds in automation.
 
 # 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"
new file mode 100644
--- /dev/null
+++ b/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