aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2006-07-26 20:22:26 +0000
committerChris Lattner <sabre@nondot.org>2006-07-26 20:22:26 +0000
commitb92596114b77871a61e32430cee249cebc5882a7 (patch)
tree3ba047da43137255787d5686d99c65e99bc441d0
parent729b7a98ad3097f63d49a074f8430fda7a244005 (diff)
downloadllvm-b92596114b77871a61e32430cee249cebc5882a7.zip
llvm-b92596114b77871a61e32430cee249cebc5882a7.tar.gz
llvm-b92596114b77871a61e32430cee249cebc5882a7.tar.bz2
Reduce work done for directory traversal in srcdir==objdir builds.
llvm-svn: 29300
-rw-r--r--llvm/Makefile.rules16
1 files changed, 16 insertions, 0 deletions
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules
index 779e0a6..eee01ee 100644
--- a/llvm/Makefile.rules
+++ b/llvm/Makefile.rules
@@ -487,6 +487,8 @@ $(PROJ_etcdir): $(PROJ_etcdir)/.dir
SubDirs :=
ifdef DIRS
SubDirs += $(DIRS)
+
+ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
$(RecursiveTargets)::
$(Verb) for dir in $(DIRS); do \
if [ ! -f $$dir/Makefile ]; then \
@@ -495,6 +497,13 @@ $(RecursiveTargets)::
fi; \
($(MAKE) -C $$dir $@ ) || exit 1; \
done
+else
+$(RecursiveTargets)::
+ $(Verb) for dir in $(DIRS); do \
+ ($(MAKE) -C $$dir $@ ) || exit 1; \
+ done
+endif
+
endif
#---------------------------------------------------------
@@ -545,6 +554,7 @@ ifdef OPTIONAL_DIRS
SubDirs += $(OPTIONAL_DIRS)
+ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
$(RecursiveTargets)::
$(Verb) for dir in $(OPTIONAL_DIRS); do \
if [ -d $(PROJ_SRC_DIR)/$$dir ]; then\
@@ -555,6 +565,12 @@ $(RecursiveTargets)::
($(MAKE) -C$$dir $@ ) || exit 1; \
fi \
done
+else
+$(RecursiveTargets)::
+ $(Verb) for dir in $(OPTIONAL_DIRS); do \
+ ($(MAKE) -C$$dir $@ ) || exit 1; \
+ done
+endif
endif
#---------------------------------------------------------