bug 422360 - don't statically link browser components when jemalloc is enabled. r=bsmedberg

browser/components/build/Makefile.in

@@ -13,8 +13,10 @@ MODULE_NAME = nsBrowserCompsModule
 FORCE_SHARED_LIB = 1
 
 # Because we are an application component, link against the CRT statically
-# (on Windows)
+# (on Windows, but only if we're not building our own CRT for jemalloc)
+ifndef MOZ_MEMORY
 USE_STATIC_LIBS = 1
+endif
 
 REQUIRES = \
 	xpcom \

browser/components/dirprovider/Makefile.in

@@ -52,8 +52,10 @@ MODULE_NAME          = BrowserDirProvider
 FORCE_SHARED_LIB     = 1
 
 # Because we are an application component, link against the CRT statically
-# (on Windows)
+# (on Windows, but only if we're not building our own CRT for jemalloc)
+ifndef MOZ_MEMORY
 USE_STATIC_LIBS      = 1
+endif
 
 REQUIRES = \
 	xpcom \

browser/components/feeds/src/Makefile.in

@@ -45,7 +45,9 @@ MODULE = browser_feeds
 LIBRARY_NAME = browser_feeds_s
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
+ifndef MOZ_MEMORY
 USE_STATIC_LIBS = 1
+endif
 
 DEFINES += \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \

browser/components/migration/src/Makefile.in

@@ -45,7 +45,9 @@ MODULE		= migration
 LIBRARY_NAME	= migration_s
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
+ifndef MOZ_MEMORY
 USE_STATIC_LIBS = 1
+endif
 
 REQUIRES	= \
 		  xpcom \

browser/components/places/src/Makefile.in

@@ -48,7 +48,9 @@ MODULE = browserplaces
 LIBRARY_NAME  = browserplaces_s
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
+ifndef MOZ_MEMORY
 USE_STATIC_LIBS = 1
+endif
 
 REQUIRES	= \
 		  xpcom \

browser/components/shell/src/Makefile.in

@@ -45,7 +45,9 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = shellservice
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
+ifndef MOZ_MEMORY
 USE_STATIC_LIBS = 1
+endif
 
 REQUIRES	= \
 		  xpcom \