Commit d460425b authored by Kevin Modzelewski's avatar Kevin Modzelewski

Fix a bug in our build system for LLVM

For the release build, was building both tools/ and tools/llc (and tools/opt),
which could potentially run at the same time and interfere with each other.
parent 8e09e7fc
...@@ -450,6 +450,8 @@ $(LLVM_BUILDS:%=llvm/%/$1): llvm/%/$1: llvm/%/$2 ...@@ -450,6 +450,8 @@ $(LLVM_BUILDS:%=llvm/%/$1): llvm/%/$1: llvm/%/$2
) )
endef endef
###
# LLVM build dependency management:
$(call add_llvm_dep,lib/TableGen,lib/Support) $(call add_llvm_dep,lib/TableGen,lib/Support)
$(call add_llvm_dep,utils/TableGen,lib/TableGen) $(call add_llvm_dep,utils/TableGen,lib/TableGen)
$(call add_llvm_dep,lib/IR,utils/TableGen) $(call add_llvm_dep,lib/IR,utils/TableGen)
...@@ -469,9 +471,15 @@ $(call add_llvm_dep,utils,lib) ...@@ -469,9 +471,15 @@ $(call add_llvm_dep,utils,lib)
$(foreach tool,$(LLVM_TOOLS),$(foreach build,$(LLVM_BUILDS),$(eval \ $(foreach tool,$(LLVM_TOOLS),$(foreach build,$(LLVM_BUILDS),$(eval \
llvm/$(build)/tools/$(tool): llvm/$(build)/lib \ llvm/$(build)/tools/$(tool): llvm/$(build)/lib \
))) )))
$(LLVM_BUILDS:%=llvm_%): llvm_%: llvm/%/lib llvm/%/tools/llvm-config $(LLVM_TOOLS:%=llvm/\%/tools/%)
##
# LLVM build subset specifications:
$(LLVM_BUILDS:%=llvm_%): llvm_%: llvm/%/lib llvm/%/tools/llvm-config
touch $(LLVM_BUILD)/$(patsubst llvm_%,built_%,$@) touch $(LLVM_BUILD)/$(patsubst llvm_%,built_%,$@)
llvm_release: llvm/release/tools llvm/release/utils llvm_release: llvm/release/tools llvm/release/utils
llvm_quick: $(LLVM_TOOLS:%=llvm/quick/tools/%)
llvm_debug: $(LLVM_TOOLS:%=llvm/debug/tools/%)
llvm_quick_clean: llvm_quick_clean:
$(MAKE) -C $(LLVM_BUILD) ENABLE_OPTIMIZED=1 clean $(MAKE) -C $(LLVM_BUILD) ENABLE_OPTIMIZED=1 clean
llvm_release_%: llvm_release_%:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment