nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 454192 - firefox-bin doesn't use jemalloc on linux/solaris, r=ted

Browse source
This commit is contained in:
Benjamin Smedberg 2008-09-15 12:03:30 -04:00
parent 30d86d2887
commit bd6ebd01a7
4 changed files with 9 additions and 15 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
browser/app/Makefile.in
View file

@ -72,11 +72,7 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBX
DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID) DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
ifdef MOZ_MEMORY LIBS += $(JEMALLOC_LIBS)
ifneq ($(OS_ARCH),WINNT)
LIBS += -ljemalloc
endif
endif
ifdef LIBXUL_SDK ifdef LIBXUL_SDK
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

6
config/config.mk
View file

@ -153,6 +153,12 @@ FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names
MOZ_UNICHARUTIL_LIBS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) MOZ_UNICHARUTIL_LIBS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX) MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
ifdef MOZ_MEMORY
ifneq ($(OS_ARCH),WINNT)
JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME,jemalloc) $(MKSHLIB_UNFORCE_ALL)
endif
endif
# determine debug-related options # determine debug-related options
_DEBUG_CFLAGS := _DEBUG_CFLAGS :=
_DEBUG_LDFLAGS := _DEBUG_LDFLAGS :=

6
xulrunner/app/Makefile.in
View file

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

6
xulrunner/stub/Makefile.in
View file

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