Bug 538753 - Port |Bug 508861 - [electrolysis] Build/ship the C++ runtime with MSVC/jemalloc| to comm-central; (Av1) Remove AC_DEFINE(_STATIC_CPPLIB), missed in bug 512763, (1.9.2+).
☠☠ backed out by 8a5bc9cd07c3 ☠ ☠
authorSerge Gautherie <sgautherie.bz@free.fr>
Tue, 16 Mar 2010 17:21:28 +0100
changeset 5181 e990fa115c50057d59565b191158cf69fee2ba01
parent 5180 1b0341bc4d0a8a31c42540888dea6d24a4bdc18c
child 5182 1accdf43c5767cdc0d35d7654aac9aaf140ca582
push id3998
push usersgautherie.bz@free.fr
push dateTue, 16 Mar 2010 16:21:57 +0000
treeherdercomm-central@1accdf43c576 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs538753, 508861, 512763
Bug 538753 - Port |Bug 508861 - [electrolysis] Build/ship the C++ runtime with MSVC/jemalloc| to comm-central; (Av1) Remove AC_DEFINE(_STATIC_CPPLIB), missed in bug 512763, (1.9.2+). r=gozer.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -6052,19 +6052,16 @@ 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
     ;;