forked from mirrors/gecko-dev
Bug 552385 - "Memory" directory is compiling twice while building fennec. r=ted.mielczarek
This commit is contained in:
parent
f6c7ef8a5d
commit
ba0dff954e
2 changed files with 7 additions and 2 deletions
|
|
@ -61,10 +61,15 @@ TIERS += base
|
||||||
tier_base_dirs = \
|
tier_base_dirs = \
|
||||||
config \
|
config \
|
||||||
build \
|
build \
|
||||||
memory \
|
|
||||||
probes \
|
probes \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
ifndef LIBXUL_SDK
|
||||||
|
tier_base_dirs += \
|
||||||
|
memory \
|
||||||
|
$(NULL)
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef COMPILE_ENVIRONMENT
|
ifdef COMPILE_ENVIRONMENT
|
||||||
include $(topsrcdir)/$(MOZ_BUILD_APP)/build.mk
|
include $(topsrcdir)/$(MOZ_BUILD_APP)/build.mk
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ if [ "$WINCE" ]; then
|
||||||
"
|
"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$MOZ_MEMORY" ]; then
|
if [ "$MOZ_MEMORY" -a "$LIBXUL_SDK" -eq ""]; then
|
||||||
add_makefiles "
|
add_makefiles "
|
||||||
memory/jemalloc/Makefile
|
memory/jemalloc/Makefile
|
||||||
"
|
"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue