Bug 1248890 - Enable rust for win64 beta and release builds. r?rail draft
authorRalph Giles <giles@mozilla.com>
Fri, 15 Apr 2016 17:06:01 -0700
changeset 352237 c3320d0b0b300c4254aa245ac215d26aea4c6a4e
parent 352236 f5a97eb5c89a2b5133ff8bba915acba6344fa7cc
child 518618 42c5b1a3070ca81a4d5b575de691230f15652c6e
push id15656
push userbmo:giles@thaumas.net
push dateSat, 16 Apr 2016 00:09:13 +0000
reviewersrail
bugs1248890
milestone48.0a1
Bug 1248890 - Enable rust for win64 beta and release builds. r?rail We've let this ride the trains for other archs. Should do so for win64 as well. MozReview-Commit-ID: D7dS9femsBj
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,17 +60,16 @@ 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,9 +9,11 @@ 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,9 +15,11 @@ 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"