bug 1138924: fix win64's xulrunner mozconfig. r=rail, a=bustage GECKO370b2_2015030222_RELBRANCH
authorBen Hearsum <bhearsum@mozilla.com>
Tue, 03 Mar 2015 09:07:02 -0500
branchGECKO370b2_2015030222_RELBRANCH
changeset 250163 e8ec4e64fe84
parent 250161 ea8adb825779
child 250167 bba77d7fde28
push id4518
push userbhearsum@mozilla.com
push date2015-03-03 14:08 +0000
treeherdermozilla-beta@e8ec4e64fe84 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrail, bustage
bugs1138924
milestone37.0
bug 1138924: fix win64's xulrunner mozconfig. r=rail, a=bustage
xulrunner/config/mozconfigs/win64/xulrunner
--- a/xulrunner/config/mozconfigs/win64/xulrunner
+++ b/xulrunner/config/mozconfigs/win64/xulrunner
@@ -5,9 +5,15 @@ 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/xulrunner/config/mozconfigs/common.override"