Backing out bug 415928 to hopefully fix runtime failures on perf boxes
authordtownsend@oxymoronical.com
Sat, 23 Feb 2008 07:44:54 -0800
changeset 12155 c007ea66c20e6e7eceb1db048bb475e74e4d6e8b
parent 12154 cc1a1bb60e3a919f27772c93900cd157126d900a
child 12156 c919c136540da35e4338954a272d1e92d36e6c10
push idunknown
push userunknown
push dateunknown
bugs415928
milestone1.9b4pre
Backing out bug 415928 to hopefully fix runtime failures on perf boxes
browser/installer/removed-files.in
configure.in
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -581,16 +581,8 @@ 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,19 +6116,16 @@ 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)