Bug 751695 - Make our builders pick the correct mozconfig on Windows based on whether they're on a 32-bit or a 64-bit platform; r=ted

--HG--
extra : rebase_source : dc05b5616220327c38f4f4623e2a91dc83b47d3f

browser/config/mozconfigs/win32/debug

@@ -7,7 +7,11 @@ export MOZILLA_OFFICIAL=1
 
 mk_add_options MOZ_MAKE_FLAGS=-j1
 
+if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
+  . $topsrcdir/build/win32/mozconfig.vs2010-win64
+else
   . $topsrcdir/build/win32/mozconfig.vs2010
+fi
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

browser/config/mozconfigs/win32/l10n-mozconfig

@@ -3,4 +3,8 @@ ac_add_options --enable-update-packaging
 ac_add_options --enable-official-branding
 ac_add_options --with-l10n-base=../../l10n-central
 
+if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
+  . $topsrcdir/build/win32/mozconfig.vs2010-win64
+else
   . $topsrcdir/build/win32/mozconfig.vs2010
+fi

browser/config/mozconfigs/win32/nightly

@@ -16,7 +16,11 @@ export MOZ_TELEMETRY_REPORTING=1
 
 mk_add_options MOZ_MAKE_FLAGS=-j1
 
+if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
+  . $topsrcdir/build/win32/mozconfig.vs2010-win64
+else
   . $topsrcdir/build/win32/mozconfig.vs2010
+fi
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

browser/config/mozconfigs/win32/release

@@ -12,7 +12,11 @@ export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
+if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
+  . $topsrcdir/build/win32/mozconfig.vs2010-win64
+else
   . $topsrcdir/build/win32/mozconfig.vs2010
+fi
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1