RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

Make some changes suggested by Chris:

Browse Source 
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:
Reid Spencer 2006-05-17 22:55:35 +00:00
parent ab4cc2c9a5
commit 8dbff8efda
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -7,7 +7,7 @@
# #
#===------------------------------------------------------------------------===# #===------------------------------------------------------------------------===#
LEVEL = . LEVEL = .
DIRS = lib/System lib/Support utils lib DIRS = lib/System lib/Support utils lib/VMCore lib
include $(LEVEL)/Makefile.config include $(LEVEL)/Makefile.config

16
Makefile.rules
View File

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

4
lib/Makefile
View File

@ -8,8 +8,8 @@
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
LEVEL = .. LEVEL = ..
DIRS = VMCore Analysis Transforms AsmParser Bytecode CodeGen Target \ PARALLEL_DIRS = VMCore Analysis Transforms AsmParser Bytecode CodeGen Target \
ExecutionEngine Debugger Linker ExecutionEngine Debugger Linker
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common