Bug 682303 Don't remove jemalloc.dll after update if we're building with MOZ_MEMORY as we do need jemalloc.dll now. r=bienvenu
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 26 Aug 2011 17:35:59 +0100
changeset 9058 f66af1873d263cdfcf1d7a510d493575f63fd896
parent 9057 b7e43ce5e3692590b5c528856b1331cbc8ef690b
child 9059 088aec7c13fb376cbbf77b311fd54db833ebcf40
push id230
push userbugzilla@standard8.plus.com
push dateTue, 08 Nov 2011 22:55:24 +0000
treeherdercomm-beta@63dad5648415 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbienvenu
bugs682303
Bug 682303 Don't remove jemalloc.dll after update if we're building with MOZ_MEMORY as we do need jemalloc.dll now. r=bienvenu
mail/installer/removed-files.in
--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -282,22 +282,28 @@ res/html/gopher-unknown.gif
 uninstall/UninstallThunderbird.exe
 uninstall/uninst.exe
 uninstall/uninstall.exe
 #ifdef XP_MACOSX
   updater.app/Contents/MacOS/updater.ini
 #endif
 .autoreg
 component.reg
-#ifdef XP_MACOSX
+#ifdef XP_UNIX
+  #ifndef XP_MACOSX
+    @DLL_PREFIX@jemalloc@DLL_SUFFIX
+  #endif
+#endif
+#ifdef XP_WIN32
+  #ifndef MOZ_MEMORY
+    @DLL_PREFIX@jemalloc@DLL_SUFFIX@
+  #endif
+#endif
 #ifndef MOZ_MEMORY_DARWIN
-@DLL_PREFIX@jemalloc@DLL_SUFFIX@
-#endif
-#else
-@DLL_PREFIX@jemalloc@DLL_SUFFIX@
+  @DLL_PREFIX@jemalloc@DLL_SUFFIX@
 #endif
 #ifdef XP_WIN
   mozcrt19.dll
   mozcpp19.dll
 #endif
 #ifdef MOZ_STATIC_JS
 @DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif