Bug 552385 - "Memory" directory is compiling twice while building fen…

…nec. r=ted.mielczarek
Brli · Mar 24, 2010 · 7d9e1e5 · 7d9e1e5
1 parent 71b9a21
commit 7d9e1e5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -61,10 +61,15 @@ TIERS += base
 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

diff --git a/allmakefiles.sh b/allmakefiles.sh
@@ -85,7 +85,7 @@ if [ "$WINCE" ]; then
   "
 fi
 
-if [ "$MOZ_MEMORY" ]; then
+if [ "$MOZ_MEMORY" -a "$LIBXUL_SDK" -eq ""]; then
   add_makefiles "
     memory/jemalloc/Makefile
   "