From 4c14f815ae94b050bca9eb11efa3b09ba0ad2961 Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Thu, 10 Dec 2015 16:12:26 -0500 Subject: [PATCH] Bug 1243037 - part 4 - enable rust on win64 nightly builds. r=mshal --- browser/config/mozconfigs/whitelist | 1 + browser/config/mozconfigs/win64/debug | 2 ++ browser/config/mozconfigs/win64/nightly | 2 ++ 3 files changed, 5 insertions(+) diff --git a/browser/config/mozconfigs/whitelist b/browser/config/mozconfigs/whitelist index 54edec3f9c7..4d85bc90d9c 100644 --- a/browser/config/mozconfigs/whitelist +++ b/browser/config/mozconfigs/whitelist @@ -67,6 +67,7 @@ whitelist['nightly']['win32'] += [ whitelist['nightly']['win64'] += [ '. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"', '. "$topsrcdir/build/mozconfig.cache"', + '. "$topsrcdir/build/mozconfig.rust"', ] for platform in all_platforms: diff --git a/browser/config/mozconfigs/win64/debug b/browser/config/mozconfigs/win64/debug index 80054ba132e..b361a4db204 100644 --- a/browser/config/mozconfigs/win64/debug +++ b/browser/config/mozconfigs/win64/debug @@ -30,5 +30,7 @@ ac_add_options --with-branding=browser/branding/nightly . $topsrcdir/build/win64/mozconfig.vs2013 +. "$topsrcdir/build/mozconfig.rust" + . "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.cache" diff --git a/browser/config/mozconfigs/win64/nightly b/browser/config/mozconfigs/win64/nightly index 9c31c44644e..f710aabe3a0 100644 --- a/browser/config/mozconfigs/win64/nightly +++ b/browser/config/mozconfigs/win64/nightly @@ -7,5 +7,7 @@ ac_add_options --enable-verify-mar ac_add_options --with-branding=browser/branding/nightly +. "$topsrcdir/build/mozconfig.rust" + . "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.cache"