Merge m-c to inbound. a=merge
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 27 Jan 2015 10:13:18 -0500
changeset 239401 f6ae50b7b0421f5f654e458139f13fae5f5af2ae
parent 239400 9eea797eb8c2d152ffc8b30004ac9a1d0f28bcf8 (current diff)
parent 239336 1dd013ece082b6c89c63ea82c21d86d43a08feec (diff)
child 239402 bf6dcc8a0d57f39d22eeffbbf43ba43e417b4a31
push id497
push usermleibovic@mozilla.com
push dateWed, 28 Jan 2015 16:43:37 +0000
reviewersmerge
milestone38.0a1
Merge m-c to inbound. a=merge
--- a/browser/config/mozconfigs/whitelist
+++ b/browser/config/mozconfigs/whitelist
@@ -62,16 +62,17 @@ whitelist['nightly']['win32'] += [
     'mk_add_options MOZ_MAKE_FLAGS=-j1',
     '. "$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"',
 ]
 
 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',