Follow-up fix for bug 682303 - move the mac jemalloc removal into a mac specific ifdef so it doesn't get removed on windows. r=nightly bustage fix
authorMark Banner <bugzilla@standard8.plus.com>
Sat, 27 Aug 2011 17:36:27 +0100
changeset 8382 27529ca52af4142e4e6a45c02c70fde93aa5ef7a
parent 8381 72265fa31f49918ef1d2cf738b952e8eaf9ac2aa
child 8383 cafa64aa6bf8d20af6af71c7cf45c356fa0d96ad
push id6431
push userbugzilla@standard8.plus.com
push dateSat, 27 Aug 2011 16:36:33 +0000
treeherdercomm-central@27529ca52af4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnightly
bugs682303
Follow-up fix for bug 682303 - move the mac jemalloc removal into a mac specific ifdef so it doesn't get removed on windows. r=nightly bustage fix
mail/installer/removed-files.in
--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -283,28 +283,29 @@ uninstall/UninstallThunderbird.exe
 uninstall/uninst.exe
 uninstall/uninstall.exe
 #ifdef XP_MACOSX
   updater.app/Contents/MacOS/updater.ini
 #endif
 .autoreg
 component.reg
 #ifdef XP_UNIX
-  #ifndef XP_MACOSX
+  #ifdef XP_MACOSX
+    #ifndef MOZ_MEMORY_DARWIN
+      @DLL_PREFIX@jemalloc@DLL_SUFFIX@
+    #endif
+  #else
     @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
 #ifdef XP_WIN
   mozcrt19.dll
   mozcpp19.dll
 #endif
 #ifdef MOZ_STATIC_JS
 @DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif
 mozilla-installer-bin