Fix parallel recursive make to build directories in order

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3794 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.common b/Makefile.common
index cd21b40f4228951160a44488ee129aa3ded489cd..da515716b0add086daebc0e5120570f1f199fb7e 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -179,12 +179,10 @@ ObjectsG = $(addprefix $(BUILD_ROOT)/Debug/,$(Objs))
 
 ifdef DIRS  # Only do this if we're using DIRS!
 
-all     :: $(addsuffix /.makeall    , $(DIRS))
-install :: $(addsuffix /.makeinstall, $(DIRS))
-clean   :: $(addsuffix /.makeclean  , $(DIRS))
-
-%/.makeall %/.makeclean %/.makeinstall:
-       $(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@)
+all install clean::
+       @for dir in ${DIRS}; do \
+               (cd $$dir; $(MAKE) $@) || exit 1; \
+       done
 endif
 
 #---------------------------------------------------------

diff --git a/Makefile.rules b/Makefile.rules
index cd21b40f4228951160a44488ee129aa3ded489cd..da515716b0add086daebc0e5120570f1f199fb7e 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -179,12 +179,10 @@ ObjectsG = $(addprefix $(BUILD_ROOT)/Debug/,$(Objs))
 
 ifdef DIRS  # Only do this if we're using DIRS!
 
-all     :: $(addsuffix /.makeall    , $(DIRS))
-install :: $(addsuffix /.makeinstall, $(DIRS))
-clean   :: $(addsuffix /.makeclean  , $(DIRS))
-
-%/.makeall %/.makeclean %/.makeinstall:
-       $(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@)
+all install clean::
+       @for dir in ${DIRS}; do \
+               (cd $$dir; $(MAKE) $@) || exit 1; \
+       done
 endif
 
 #---------------------------------------------------------