Bug 552385 - "Memory" directory is compiling twice while building fennec. r=ted.mielczarek
authorEgor Starkov <starkov.egor@gmail.com>
Wed, 24 Mar 2010 06:07:45 -0400
changeset 39767 d46f1771de598eb9aec5a5988bd1e81f06b62c4c
parent 39766 6387e3a7dd75462e6776af60345df2ae610e4ea7
child 39768 add0b286ced6621754d5d65ae67d576f2f8802d4
push idunknown
push userunknown
push dateunknown
reviewersted
bugs552385
milestone1.9.3a4pre
Bug 552385 - "Memory" directory is compiling twice while building fennec. r=ted.mielczarek
Makefile.in
allmakefiles.sh
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,20 +56,25 @@ default::
 TIERS += base
 
 #
 # tier "base" - basic setup
 #
 tier_base_dirs = \
 	config \
 	build \
-	memory \
 	probes \
 	$(NULL)
 
+ifndef LIBXUL_SDK
+tier_base_dirs += \
+	memory \
+	$(NULL)
+endif
+
 ifdef COMPILE_ENVIRONMENT
 include $(topsrcdir)/$(MOZ_BUILD_APP)/build.mk
 endif
 
 TIERS += testharness
 
 # test harnesses
 ifdef ENABLE_TESTS
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -80,17 +80,17 @@ if [ "$WINCE" ]; then
     build/wince/shunt/Makefile
     build/wince/shunt/include/windows.h
     build/wince/shunt/include/ymath.h
     build/wince/shunt/include/stdlib.h
     build/wince/shunt/include/sys/Makefile
   "
 fi
 
-if [ "$MOZ_MEMORY" ]; then
+if [ "$MOZ_MEMORY" -a "$LIBXUL_SDK" -eq ""]; then
   add_makefiles "
     memory/jemalloc/Makefile
   "
 fi
 
 #
 # Application-specific makefiles
 #