Bug 633465 - Turn off bug 591836 workaround on Win64. r=khuey a=johnath
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Mon, 28 Feb 2011 16:42:33 +0900
changeset 63163 554fa6c29f0788b52ceead2f9012b0c623ad85f5
parent 63162 fc44e3ee260870625b9cd77685758b16b4db24ed
child 63164 f7de2d1130962c176ef6dc3f82a014cc3af502b4
push id19051
push userm_kato@ga2.so-net.ne.jp
push dateMon, 28 Feb 2011 07:48:06 +0000
treeherdermozilla-central@554fa6c29f07 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey, johnath
bugs633465, 591836
milestone2.0b13pre
first release with
nightly linux32
554fa6c29f07 / 4.0b13pre / 20110228030400 / files
nightly linux64
554fa6c29f07 / 4.0b13pre / 20110228030400 / files
nightly mac
554fa6c29f07 / 4.0b13pre / 20110228030400 / files
nightly win32
554fa6c29f07 / 4.0b13pre / 20110228030400 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 633465 - Turn off bug 591836 workaround on Win64. r=khuey a=johnath
configure.in
--- a/configure.in
+++ b/configure.in
@@ -8358,17 +8358,17 @@ MOZ_ARG_ENABLE_BOOL(static,
     BUILD_STATIC_LIBS=)
 
 MOZ_ARG_ENABLE_BOOL(libxul,
 [  --enable-libxul         Enable building of libxul],
     MOZ_ENABLE_LIBXUL=1,
     MOZ_ENABLE_LIBXUL=)
 
 # split JS out by default to avoid VS2005 PGO crash (bug 591836).
-if test "$OS_ARCH" = "WINNT"; then
+if test "$OS_ARCH" = "WINNT" -a "$CPU_ARCH" != "x86_64" ; then
   ENABLE_SHARED_JS=1
 fi
 
 MOZ_ARG_ENABLE_BOOL(shared-js,
 [  --enable-shared-js
                           Create a shared JavaScript library.],
     ENABLE_SHARED_JS=1,
     ENABLE_SHARED_JS=)