author | Mike Hommey <mh+mozilla@glandium.org> |
Wed, 17 Nov 2010 10:50:00 +0100 | |
changeset 57648 | ad227939db8264407c22615e5acc4b18c77b49f3 |
parent 57647 | c08726dd68fc0da23408a312f3ff36625655a6e0 |
child 57649 | 4c960203c759afff0fcfd29361c3f968e800b8b1 |
child 59340 | aa2c205e34acd8d4dd6ad83b8a4557649ca05241 |
push id | 17021 |
push user | mh@glandium.org |
push date | Wed, 17 Nov 2010 09:50:46 +0000 |
treeherder | mozilla-central@ad227939db82 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | orange-fix |
bugs | 611405 |
milestone | 2.0b8pre |
first release with | nightly linux32
ad227939db82
/
4.0b8pre
/
20101117020023
/
files
nightly linux64
ad227939db82
/
4.0b8pre
/
20101117030835
/
files
nightly mac
ad227939db82
/
4.0b8pre
/
20101117030837
/
files
nightly win32
ad227939db82
/
4.0b8pre
/
20101117042805
/
files
nightly win64
ad227939db82
/
4.0b8pre
/
20101117044716
/
files
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
releases | nightly linux32
4.0b8pre
/
20101117020023
/
pushlog to previous
nightly linux64
4.0b8pre
/
20101117030835
/
pushlog to previous
nightly mac
4.0b8pre
/
20101117030837
/
pushlog to previous
nightly win32
4.0b8pre
/
20101117042805
/
pushlog to previous
nightly win64
4.0b8pre
/
20101117044716
/
pushlog to previous
|
--- a/js/src/config/config.mk +++ b/js/src/config/config.mk @@ -157,16 +157,21 @@ FINAL_LINK_COMPS = $(DEPTH)/config/final FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names MOZ_UNICHARUTIL_LIBS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX) ifdef MOZ_MEMORY ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH))) JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_MOZLIBNAME,jemalloc) $(MKSHLIB_UNFORCE_ALL) +# If we are linking jemalloc into a program, we want the jemalloc symbols +# to be exported +ifneq (,$(SIMPLE_PROGRAMS)$(PROGRAM)) +JEMALLOC_LIBS += $(MOZ_JEMALLOC_STANDALONE_GLUE_LDOPTS) +endif endif endif CC := $(CC_WRAPPER) $(CC) CXX := $(CXX_WRAPPER) $(CXX) # determine debug-related options _DEBUG_CFLAGS :=