forked from OSchip/llvm-project
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. llvm-svn: 28374
This commit is contained in:
parent
fc08d5a2a8
commit
a22a5b382f
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue