bug 415928 - fix packaging of CRT with jemalloc - fix CRT linkage. r=bsmedberg
authorted.mielczarek@gmail.com
Wed, 20 Feb 2008 04:33:11 -0800
changeset 11945 69413c47599dd00aa8202b86630c19c111568e9e
parent 11944 486dec2b5808c495096edc6bc1eb576aa95526ae
child 11946 b0763558fe56e13c58dd1fe94368d6763fc32d48
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs415928
milestone1.9b4pre
bug 415928 - fix packaging of CRT with jemalloc - fix CRT linkage. r=bsmedberg
configure.in
--- a/configure.in
+++ b/configure.in
@@ -6082,16 +6082,20 @@ if test "$MOZ_MEMORY"; then
     fi
     dnl need win32 paths in LIB, hence this python abuse.  extra brackets
     dnl are to avoid m4
     _WIN_CRT_PATH=[`$PYTHON -c 'import sys, os.path; print os.path.normpath(sys.argv[1])' "$_WIN_UNIX_CRT_PATH"`]
     MOZ_LIB="$_WIN_CRT_PATH;$LIB"
     dnl Needs to be in PATH too, since our tools will wind up linked against it.
     dnl This needs to be unix style.
     MOZ_PATH="$PATH:$_WIN_UNIX_CRT_PATH"
+    dnl Statically link the C++ stdlib.  We only use this for Breakpad anyway.
+    AC_DEFINE(_STATIC_CPPLIB)
+    dnl Don't generate a manifest, since we're linking to a custom CRT.
+    LDFLAGS="$LDFLAGS -MANIFEST:NO"
     ;;
   *)
     AC_MSG_ERROR([--enable-jemalloc not supported on ${target}])
     ;;
   esac
 fi
 AC_SUBST(MOZ_MEMORY)
 AC_SUBST(WIN32_CRT_SRC_DIR)