bug 451193. link xulrunner-stub with jemalloc on linux. r=bsmedberg

This commit is contained in:
Stuart Parmenter 2008-08-26 15:25:05 -07:00
parent f54c209e31
commit a02648cc99
3 changed files with 17 additions and 0 deletions

View File

@ -99,7 +99,12 @@ LIBRARY_NAME = jemalloc
# Build jemalloc as a shared lib. This is mandatory for Darwin, since a library
# init function is used on that platform.
ifeq ($(OS_ARCH),Darwin)
FORCE_SHARED_LIB= 1
else
DIST_INSTALL = 1
FORCE_STATIC_LIB= 1
endif
CSRCS = \
jemalloc.c \

View File

@ -174,6 +174,12 @@ endif
RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
endif
ifdef MOZ_MEMORY
ifneq ($(OS_ARCH),WINNT)
LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
endif
endif
include $(topsrcdir)/config/rules.mk
DEFINES += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"

View File

@ -97,6 +97,12 @@ ifdef _MSC_VER
WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
endif
ifdef MOZ_MEMORY
ifneq ($(OS_ARCH),WINNT)
LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
endif
endif
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH),WINNT)