Port 'Bug 609976: Fold js back into libxul on Windows now that PGO seems less grumpy.' to comm-central to try and fix trace malloc bustage on windows.
☠☠ backed out by 5f253d5c2fb7 ☠ ☠
authorMark Banner <bugzilla@standard8.plus.com>
Mon, 22 Nov 2010 09:38:56 +0000
changeset 6736 7996fcc11af9d6f01f6bd5af1acadeb866641a86
parent 6735 dec9e1fed0856b6417b32a2708a7cdf0e2ac3f90
child 6737 0e9611ad2f8da0a1b9cd81195b0be1f6d2f8b5f1
push idunknown
push userunknown
push dateunknown
bugs609976
Port 'Bug 609976: Fold js back into libxul on Windows now that PGO seems less grumpy.' to comm-central to try and fix trace malloc bustage on windows.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -4220,21 +4220,16 @@ SYSTEM_LIBXUL=
 MOZ_ARG_WITH_BOOL(system-libxul,
 [  --with-system-libxul   Use system installed libxul SDK],
     SYSTEM_LIBXUL=1)
 
 if test -n "$SYSTEM_LIBXUL" -a -z "$MOZ_ENABLE_LIBXUL"; then
     AC_MSG_ERROR([--with-system-libxul needs --with-libxul-sdk])
 fi
 
-# split JS out by default to avoid VS2005 PGO crash (bug 591836).
-if test "$OS_ARCH" = "WINNT"; 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=)
 
 if test -z "$MOZ_ENABLE_LIBXUL"; then
   dnl --disable-libxul implies shared js
   ENABLE_SHARED_JS=1