OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #7442 : graydon/rust/clean-llvm-trigger, r=brson

Browse Source 
This makes it possible for us to trigger the llvm-clean make-target by checking in a change that touches rustllvm/llvm-auto-clean-stamp. Most developers don't need to see or know about this, but when you push a change that "needs an LLVM rebuild", even if not otherwise obvious, this should give a mechanism to do it.
This commit is contained in:
bors 2013-06-29 08:17:01 -07:00
commit 88830996d8
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.in
View File

@ -540,10 +540,19 @@ ALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
$(foreach host,$(CFG_HOST_TRIPLES), \ $(foreach host,$(CFG_HOST_TRIPLES), \
all-target-$(target)-host-$(host))) all-target-$(target)-host-$(host)))
all: $(ALL_TARGET_RULES) $(GENERATED) docs all: rustllvm/llvm-auto-clean-stamp \
$(ALL_TARGET_RULES) $(GENERATED) docs
endif endif
# This is used to independently force an LLVM clean rebuild
# when we changed something not otherwise captured by builtin
# dependencies. In these cases, commit a change that touches
# the stamp in the source dir.
rustllvm/llvm-auto-clean-stamp: $(S)src/rustllvm/llvm-auto-clean-trigger
$(Q)$(MAKE) clean-llvm
touch $@
###################################################################### ######################################################################
# Re-configuration # Re-configuration

2
mk/clean.mk
View File

@ -23,7 +23,7 @@ CLEAN_LLVM_RULES = \
$(foreach target, $(CFG_TARGET_TRIPLES), \ $(foreach target, $(CFG_TARGET_TRIPLES), \
clean-llvm$(target)) clean-llvm$(target))
.PHONY: clean clean-all clean-misc .PHONY: clean clean-all clean-misc clean-llvm
clean-all: clean clean-llvm clean-all: clean clean-llvm

0
src/rustllvm/llvm-auto-clean-trigger Normal file
View File