Bug 481584 - add libpath to link jemalloc in xulrunner and xulrunner-stub on windows ce; (Cv1) Copy it to comm-central.
authorSerge Gautherie <sgautherie.bz@free.fr>
Sun, 14 Feb 2010 04:58:06 +0100
changeset 4907 ccfb59da8aadff3bcc12e615de95d0f781145f1e
parent 4906 1911acef7131e0ef1ec218e4bcb6ec0f53175ce5
child 4908 e155dad68f713a0a59cba0b529d1f54cb6ad408a
push idunknown
push userunknown
push dateunknown
bugs481584
Bug 481584 - add libpath to link jemalloc in xulrunner and xulrunner-stub on windows ce; (Cv1) Copy it to comm-central. r=Callek.
config/config.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -145,17 +145,17 @@ FINAL_LINK_LIBS = $(MOZDEPTH)/config/fin
 FINAL_LINK_COMPS = $(MOZDEPTH)/config/final-link-comps
 FINAL_LINK_COMP_NAMES = $(MOZDEPTH)/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 ($(OS_ARCH),WINNT)
-JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME,jemalloc) $(MKSHLIB_UNFORCE_ALL)
+JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib) $(MKSHLIB_UNFORCE_ALL)
 endif
 endif
 
 # determine debug-related options
 _DEBUG_CFLAGS :=
 _DEBUG_LDFLAGS :=
 
 ifndef MOZ_DEBUG