Bustage fix for Mac - port bug 414946 - Enable jemalloc on Mac. r=bustage-fix
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 08 Jul 2011 12:04:06 +0100
changeset 8523 39dec65470833a2d9a767a478ae90e0a2ee209cf
parent 8522 5869ce3fda484bf7c7276ff696816252afc49ddd
child 8527 9b9d32bb5fd2b497cc3351a3cf6ef0f849b2cec9
push idunknown
push userunknown
push dateunknown
reviewersbustage-fix
bugs414946
Bustage fix for Mac - port bug 414946 - Enable jemalloc on Mac. r=bustage-fix
configure.in
mail/installer/package-manifest.in
suite/installer/package-manifest.in
--- a/configure.in
+++ b/configure.in
@@ -1908,16 +1908,17 @@ ld.])
     MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
     MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
     # If we're building with --enable-profiling, we need a frame pointer.
     if test -z "$MOZ_PROFILING"; then
         MOZ_OPTIMIZE_FLAGS="-O3 -fomit-frame-pointer"
     else
         MOZ_OPTIMIZE_FLAGS="-O3 -fno-omit-frame-pointer"
     fi
+    MOZ_MEMORY=1
     _PEDANTIC=
     CFLAGS="$CFLAGS -fpascal-strings -fno-common"
     CXXFLAGS="$CXXFLAGS -fpascal-strings -fno-common"
     DLL_SUFFIX=".dylib"
     DSO_LDOPTS=''
     STRIP="$STRIP -x -S"
     _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
     TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -60,16 +60,19 @@
 @BINPATH@/msvcr100.dll
 #endif
 #else
 @BINPATH@/mozcrt19.dll
 @BINPATH@/mozcpp19.dll
 #endif
 #endif
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
+#ifdef MOZ_MEMORY_DARWIN
+@BINPATH@/@DLL_PREFIX@jemalloc@DLL_SUFFIX@
+#endif
 #ifdef XP_MACOSX
 @BINPATH@/XUL
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 #ifdef XP_MACOSX
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
 @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -88,16 +88,19 @@
 #endif
 #endif
 #else
 @BINPATH@/mozcrt19.dll
 @BINPATH@/mozcpp19.dll
 #endif
 #endif
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
+#ifdef MOZ_MEMORY_DARWIN
+@BINPATH@/@DLL_PREFIX@jemalloc@DLL_SUFFIX@
+#endif
 
 [browser]
 ; [Base Browser Files]
 #ifdef WIN_OR_OS2
 @BINPATH@/@MOZ_APP_NAME@.exe
 #else
 @BINPATH@/@MOZ_APP_NAME@-bin
 #ifndef XP_MACOSX