Bug 546065 - Port bug 488608 and bug 490325 to comm-central; (Av2) Just copy (the useful part of) it.
authorSerge Gautherie <sgautherie.bz@free.fr>
Sun, 14 Feb 2010 17:13:45 +0100
changeset 4910 8a7036180b5e2a680d5143994d495e1cbdfc8efb
parent 4909 da214c6780f1c460e82c4bea74da8f7880082d5e
child 4911 21a3938f98d8a04b60252116b2535175632d32d0
push idunknown
push userunknown
push dateunknown
bugs546065, 488608, 490325
Bug 546065 - Port bug 488608 and bug 490325 to comm-central; (Av2) Just copy (the useful part of) it. r=Callek. Bug 488608 - enable jemalloc on CE6 Bug 490325 - windows mobile bustage when building
config/config.mk
configure.in
--- a/config/config.mk
+++ b/config/config.mk
@@ -144,17 +144,17 @@ OS_CONFIG	:= $(OS_ARCH)$(OS_RELEASE)
 FINAL_LINK_LIBS = $(MOZDEPTH)/config/final-link-libs
 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)
+ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
 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 :=
 
--- a/configure.in
+++ b/configure.in
@@ -313,17 +313,17 @@ case "$target" in
     echo Building Windows CE Shunt Library and Tool Chain
     echo Using SDK in:
     echo $WINCE_SDK_DIR
 
     ac_exeext=.exe
 
     _pwdw=`pwd -W`
     _pwd=`pwd`
-    make WINCE_SDK_DIR="$WINCE_SDK_DIR" TOPSRCDIR="$srcdir/mozilla" OBJDIR="$_pwdw/mozilla" -C $srcdir/mozilla/build/wince/tools
+    make WINCE_SDK_DIR="$WINCE_SDK_DIR" TOPSRCDIR="$_topsrcdir/mozilla" OBJDIR="$_pwdw/mozilla" -C $srcdir/mozilla/build/wince/tools
 
     CC="$_pwd/mozilla/dist/sdk/bin/arm-wince-gcc"
     CXX="$_pwd/mozilla/dist/sdk/bin/arm-wince-gcc"
     CPP="$_pwd/mozilla/dist/sdk/bin/arm-wince-gcc -E -nologo"
     CXXCPP="$_pwd/mozilla/dist/sdk/bin/arm-wince-gcc -TP -E -nologo"
     LD="$_pwd/mozilla/dist/sdk/bin/arm-wince-link"
     AR="$_pwd/mozilla/dist/sdk/bin/arm-wince-lib"
     AS="$_pwd/mozilla/dist/sdk/bin/arm-wince-as"