bug 1138990: 64-bit windows xulrunner is busted - fix compiler selection for win64 xulrunner. r=glandium, a=lmandel
authorBen Hearsum <bhearsum@mozilla.com>
Fri, 06 Mar 2015 15:06:54 -0500
changeset 250276 52600b8172cf
parent 250275 f64d1d504422
child 250277 30cc597f157a
push id4534
push userbhearsum@mozilla.com
push date2015-03-06 20:07 +0000
treeherdermozilla-beta@52600b8172cf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, lmandel
bugs1138990
milestone37.0
bug 1138990: 64-bit windows xulrunner is busted - fix compiler selection for win64 xulrunner. r=glandium, a=lmandel
xulrunner/config/mozconfigs/win64/xulrunner
--- a/xulrunner/config/mozconfigs/win64/xulrunner
+++ b/xulrunner/config/mozconfigs/win64/xulrunner
@@ -5,15 +5,11 @@ ac_add_options --host=x86_64-pc-mingw32
 
 export MOZILLA_OFFICIAL=1
 export JAVA_HOME=/d/jdk1.6.0_14
 
 ac_add_options --enable-application=xulrunner
 ac_add_options --enable-jemalloc
 ac_add_options --disable-tests
 
-if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
-  . $topsrcdir/build/win32/mozconfig.vs2013-win64
-else
-  . $topsrcdir/build/win32/mozconfig.vs2010
-fi
+. $topsrcdir/build/win64/mozconfig.vs2013
 
 . "$topsrcdir/xulrunner/config/mozconfigs/common.override"