Backed out changeset 01267d99f891 (bug 1248890) r=bustage
authorRalph Giles <giles@mozilla.com>
Mon, 18 Apr 2016 14:11:58 -0700
changeset 331538 90759eb74305083f393fc9336300425fd33b3b93
parent 331537 552d5832785a58e998fbe72b055245dc8b655a88
child 331539 3a4a2e016507395be84a9066c8ba7be4eaf32887
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1248890
milestone48.0a1
backs out01267d99f891c525dc6af7eac888e08aa0aa923a
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
Backed out changeset 01267d99f891 (bug 1248890) r=bustage compare-mozconfigs-wrapper.py complains that mozconfig.rust is included in mozconfigs\win64\release but not mozconfigs\win64\release even though it is.
browser/config/mozconfigs/whitelist
browser/config/mozconfigs/win64/beta
browser/config/mozconfigs/win64/release
--- a/browser/config/mozconfigs/whitelist
+++ b/browser/config/mozconfigs/whitelist
@@ -60,16 +60,17 @@ whitelist['nightly']['win32'] += [
     '. "$topsrcdir/build/mozconfig.cache"',
     'if test "$IS_NIGHTLY" != ""; then',
     'ac_add_options --disable-auto-deps',
     'fi',
 ]
 whitelist['nightly']['win64'] += [
     '. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"',
     '. "$topsrcdir/build/mozconfig.cache"',
+    '. "$topsrcdir/build/mozconfig.rust"',
 ]
 
 for platform in all_platforms:
     whitelist['release'][platform] = [
         'ac_add_options --enable-update-channel=release',
         'ac_add_options --enable-official-branding',
         'mk_add_options MOZ_MAKE_FLAGS="-j4"',
         'export BUILDING_RELEASE=1',
--- a/browser/config/mozconfigs/win64/beta
+++ b/browser/config/mozconfigs/win64/beta
@@ -9,11 +9,9 @@ fi
 . "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
 
 mk_add_options MOZ_PGO=1
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
-. "$topsrcdir/build/mozconfig.rust"
-
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/release
+++ b/browser/config/mozconfigs/win64/release
@@ -15,11 +15,9 @@ mk_add_options MOZ_PGO=1
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
 # safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
 # defines.sh during the beta cycle
 export BUILDING_RELEASE=1
 
-'. "$topsrcdir/build/mozconfig.rust"',
-
 . "$topsrcdir/build/mozconfig.common.override"