Bug 415928 - "fix packaging of CRT with jemalloc" [p=ted.mielczarek@gmail.com (Ted Mielczarek [luser]) r=bsmedberg a1.9=damons]
authorreed@reedloden.com
Sat, 23 Feb 2008 03:20:05 -0800
changeset 12152 28b672d96be802537f570bb4079dc94cd12d578a
parent 12151 44851393d5e0afe7acb02cfae787a77db5fe5676
child 12153 9002bf7b7346a300b772c4c7109bf3ce80488d45
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs415928
milestone1.9b4pre
Bug 415928 - "fix packaging of CRT with jemalloc" [p=ted.mielczarek@gmail.com (Ted Mielczarek [luser]) r=bsmedberg a1.9=damons]
browser/installer/removed-files.in
configure.in
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -581,8 +581,16 @@ readme.txt
 #endif
 dictionaries/PL.dic
 dictionaries/PL.aff
 #ifdef XP_WIN
 xpicleanup.exe
 #else
 xpicleanup
 #endif
+#ifdef MOZ_MEMORY
+#ifdef XP_WIN
+Microsoft.VC80.CRT.manifest
+msvcm80.dll
+msvcp80.dll
+msvcr80.dll
+#endif
+#endif
--- a/configure.in
+++ b/configure.in
@@ -6116,16 +6116,19 @@ if test "$MOZ_MEMORY"; then
     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"
+    dnl Also pass this to NSPR/NSS
+    DLLFLAGS="$DLLFLAGS -MANIFEST:NO"
+    export DLLFLAGS
     ;;
   *)
     AC_MSG_ERROR([--enable-jemalloc not supported on ${target}])
     ;;
   esac
 fi
 AC_SUBST(MOZ_MEMORY)
 AC_SUBST(WIN32_CRT_SRC_DIR)