From e7ff51bff9ff0bf4adf77892509804a73ca5444c Mon Sep 17 00:00:00 2001 From: "ted.mielczarek@gmail.com" Date: Thu, 13 Mar 2008 11:34:13 -0700 Subject: [PATCH] bug 422360 - don't statically link browser components when jemalloc is enabled. r=bsmedberg --- browser/components/build/Makefile.in | 4 +++- browser/components/dirprovider/Makefile.in | 4 +++- browser/components/feeds/src/Makefile.in | 2 ++ browser/components/migration/src/Makefile.in | 2 ++ browser/components/places/src/Makefile.in | 2 ++ browser/components/shell/src/Makefile.in | 2 ++ 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in index dd8205ed50f..19a7ef9595d 100644 --- a/browser/components/build/Makefile.in +++ b/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 \ diff --git a/browser/components/dirprovider/Makefile.in b/browser/components/dirprovider/Makefile.in index 545805a1466..569294c1c5d 100755 --- a/browser/components/dirprovider/Makefile.in +++ b/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 \ diff --git a/browser/components/feeds/src/Makefile.in b/browser/components/feeds/src/Makefile.in index 637b41b5b56..fdfc3719831 100644 --- a/browser/components/feeds/src/Makefile.in +++ b/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) \ diff --git a/browser/components/migration/src/Makefile.in b/browser/components/migration/src/Makefile.in index 66012e18ec9..724a98966fd 100644 --- a/browser/components/migration/src/Makefile.in +++ b/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 \ diff --git a/browser/components/places/src/Makefile.in b/browser/components/places/src/Makefile.in index a30e6ffecec..396b748fe7b 100644 --- a/browser/components/places/src/Makefile.in +++ b/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 \ diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in index 6b971ad697a..51854c198b6 100644 --- a/browser/components/shell/src/Makefile.in +++ b/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 \