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
This commit is contained in:
Reid Spencer 2006-05-17 22:55:35 +00:00
parent 84cc6dbd25
commit dd1aac36a1
3 changed files with 7 additions and 15 deletions

View File

@ -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

View File

@ -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

View File

@ -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