Back out changeset e990fa115c50 / Bug 538753 due to Windows builds failing to start as reported in bug 552943.
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 17 Mar 2010 15:04:11 +0000
changeset 5196 8a5bc9cd07c37518082a2ccdbf68cfc970b4eced
parent 5195 c3a965df93aee8b4612e03d34a89d0cd084878a7
child 5197 bd28fdcccd82a37dac36a91592d99d2d4d16227c
push idunknown
push userunknown
push dateunknown
bugs538753, 552943
backs oute990fa115c50057d59565b191158cf69fee2ba01
Back out changeset e990fa115c50 / Bug 538753 due to Windows builds failing to start as reported in bug 552943.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -6052,16 +6052,19 @@ if test "$MOZ_MEMORY"; then
 
     if test ! -d "$WIN32_CRT_SRC_DIR"; then
       AC_MSG_ERROR([Invalid Win32 CRT source directory: ${WIN32_CRT_SRC_DIR}])
     fi
     WIN32_CRT_SRC_DIR=`cd "$WIN32_CRT_SRC_DIR" && pwd -W`
     _objdir_win=`pwd -W`
     WIN32_CUSTOM_CRT_DIR="$_objdir_win/mozilla/memory/jemalloc/crtsrc/build/$_WIN32_CRT_CPU"
     if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
+    dnl Statically link the C++ stdlib.  We only use this for Breakpad anyway.
+    AC_DEFINE(_STATIC_CPPLIB)
+
     MOZ_MEMORY_LDFLAGS="-MANIFEST:NO -LIBPATH:\"$WIN32_CUSTOM_CRT_DIR\" -NODEFAULTLIB:msvcrt -NODEFAULTLIB:msvcrtd -DEFAULTLIB:mozcrt19"
     else
     MOZ_MEMORY_LDFLAGS="-MANIFEST:NO -LIBPATH:\"$WIN32_CUSTOM_CRT_DIR\" -NODEFAULTLIB:msvcrt -NODEFAULTLIB:msvcrtd -NODEFAULTLIB:msvcprt -NODEFAULTLIB:msvcprtd -DEFAULTLIB:mozcrt19 -DEFAULTLIB:mozcpp19"
     fi
     dnl Also pass this to NSPR/NSS
     DLLFLAGS="$DLLFLAGS $MOZ_MEMORY_LDFLAGS"
     export DLLFLAGS
     ;;