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

@@ -586,3 +586,11 @@ xpicleanup.exe
 #else
 xpicleanup
 #endif
+#ifdef MOZ_MEMORY
+#ifdef XP_WIN
+Microsoft.VC80.CRT.manifest
+msvcm80.dll
+msvcp80.dll
+msvcr80.dll
+#endif
+#endif

configure.in

@@ -6121,6 +6121,9 @@ if test "$MOZ_MEMORY"; then
     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}])