Make some changes suggested by Chris:

1. Remove the LLVM_DO_NOT_BUILD feature (not needed any more)
2. Ensure that lib/VMCore gets built first. This needs to be done because
   VMCore now uses tblgen to generate the Intrinsics header which are
   needed in other libraries. In parallel builds, this can cause problems.

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

diff --git a/Makefile b/Makefile
index 1aa33039794ad534742c5c08114342283f742c8b..72f6e934c9a13596f4b086e08d415c16a7b02c63 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 LEVEL = .
-DIRS = lib/System lib/Support utils lib
+DIRS = lib/System lib/Support utils lib/VMCore lib
 
 include $(LEVEL)/Makefile.config 
 

diff --git a/Makefile.rules b/Makefile.rules
index aa61380aaf056dd1c6d5a3176fb80774b3b227f6..b3b10e557fe2645cfb24755238d4ef69b6cdedc0 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -472,9 +472,7 @@ $(RecursiveTargets)::
            $(MKDIR) $$dir; \
            $(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
          fi; \
-         if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
-           ($(MAKE) -C $$dir $@ ) || exit 1; \
-         fi ; \
+         ($(MAKE) -C $$dir $@ ) || exit 1; \
        done
 endif
 
@@ -489,9 +487,7 @@ $(RecursiveTargets)::
            $(MKDIR) $$dir; \
            $(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
          fi; \
-         if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
-           ($(MAKE) -C $$dir $@ ) || exit 0; \
-         fi ; \
+         ($(MAKE) -C $$dir $@ ) || exit 0; \
        done
 endif
 
@@ -517,9 +513,7 @@ $(ParallelTargets) :
          $(MKDIR) $(@D); \
          $(CP) $(PROJ_SRC_DIR)/$(@D)/Makefile $(@D)/Makefile; \
        fi; \
-       if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
-         $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@) ; \
-       fi
+       $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@) ;
 endif
 
 #---------------------------------------------------------
@@ -537,9 +531,7 @@ $(RecursiveTargets)::
              $(MKDIR) $$dir; \
              $(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
            fi; \
-           if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
-             ($(MAKE) -C$$dir $@ ) || exit 1; \
-           fi ; \
+           ($(MAKE) -C$$dir $@ ) || exit 1; \
          fi \
        done
 endif

diff --git a/lib/Makefile b/lib/Makefile
index f1eb8b3330981b806ffd09a3b291a8f13e5fd28a..7a05dfd133a4395f900e2701000c6b7045219645 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -8,8 +8,8 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ..
 
-DIRS = VMCore Analysis Transforms AsmParser Bytecode CodeGen Target \
-       ExecutionEngine Debugger Linker
+PARALLEL_DIRS = VMCore Analysis Transforms AsmParser Bytecode CodeGen Target \
+                ExecutionEngine Debugger Linker 
 
 include $(LEVEL)/Makefile.common