Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 485227 - Don't force link jemalloc on windows ce r=ted, crowder

Browse Source
This commit is contained in:
Brad Lassey 2009-03-31 12:27:25 -04:00
parent 9fd9fa4e9a
commit 3f7cac1ef0
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/wince/shunt/Makefile.in
View File

@ -70,11 +70,12 @@ DIRS += include/sys
ifdef MOZ_MEMORY
REQUIRES = jemalloc
JEMALLOC_LIB = $(DIST)/lib/jemalloc.lib
CFLAGS += -DMOZ_MEMORY
CXXFLAGS += -DMOZ_MEMORY
endif
EXTRA_LIBS += $(JEMALLOC_LIBS)
CPPSRCS = map.cpp
DEFINES += -DMOZCE_SHUNT_EXPORTS

3
build/wince/tools/arm-wince-gcc.c
View File

@ -80,9 +80,6 @@ main(int argc, char **argv)
args[i++] = "/LIBPATH:\"" WCE_LIB "\"";
args[i++] = "/LIBPATH:\"" WCE_CRT "\"";
args[i++] = "/NODEFAULTLIB";
#ifdef MOZ_MEMORY
args[i++] = JEMALLOC_LIB;
#endif
#ifdef HAVE_SHUNT // simple test to see if we're in configure or not
if(!getenv("NO_SHUNT")) {
args[i++] = "/LIBPATH:\"" SHUNT_LIB "\"";

3
build/wince/tools/arm-wince-link.c
View File

@ -15,9 +15,6 @@ main(int argc, char **argv)
args[i++] = "/LIBPATH:\"" WCE_CRT "\"";
args[i++] = "/NODEFAULTLIB";
#ifdef MOZ_MEMORY
args[i++] = JEMALLOC_LIB;
#endif
#ifdef HAVE_SHUNT // simple test to see if we're in configure or not
if(getenv("NO_SHUNT") == NULL) {
args[i++] = "/LIBPATH:\"" SHUNT_LIB "\"";

6
js/src/Makefile.in
View File

@ -61,7 +61,11 @@ LIBRARY_NAME = mozjs
STATIC_LIBRARY_NAME = js_static
GRE_MODULE = 1
LIBS = $(NSPR_LIBS)
LIBS = $(NSPR_LIBS)
ifdef WINCE
EXTRA_LIBS += $(JEMALLOC_LIBS)
endif
ifdef GNU_CXX
ifdef INTEL_CXX

1
js/src/shell/Makefile.in
View File

@ -56,6 +56,7 @@ LOCAL_INCLUDES += -I$(topsrcdir) -I..
ifdef _MSC_VER
ifdef WINCE
WIN32_EXE_LDFLAGS += -ENTRY:mainACRTStartup
EXTRA_LIBS += $(JEMALLOC_LIBS)
endif
endif