Skip to content

Commit 8883099

Browse files
committed
auto merge of #7442 : graydon/rust/clean-llvm-trigger, r=brson
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.
2 parents 0326b0a + 9591832 commit 8883099

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

Makefile.in

+10-1
Original file line numberDiff line numberDiff line change
@@ -540,10 +540,19 @@ ALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
540540
$(foreach host,$(CFG_HOST_TRIPLES), \
541541
all-target-$(target)-host-$(host)))
542542

543-
all: $(ALL_TARGET_RULES) $(GENERATED) docs
543+
all: rustllvm/llvm-auto-clean-stamp \
544+
$(ALL_TARGET_RULES) $(GENERATED) docs
544545

545546
endif
546547

548+
# This is used to independently force an LLVM clean rebuild
549+
# when we changed something not otherwise captured by builtin
550+
# dependencies. In these cases, commit a change that touches
551+
# the stamp in the source dir.
552+
rustllvm/llvm-auto-clean-stamp: $(S)src/rustllvm/llvm-auto-clean-trigger
553+
$(Q)$(MAKE) clean-llvm
554+
touch $@
555+
547556

548557
######################################################################
549558
# Re-configuration

mk/clean.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ CLEAN_LLVM_RULES = \
2323
$(foreach target, $(CFG_TARGET_TRIPLES), \
2424
clean-llvm$(target))
2525

26-
.PHONY: clean clean-all clean-misc
26+
.PHONY: clean clean-all clean-misc clean-llvm
2727

2828
clean-all: clean clean-llvm
2929

src/rustllvm/llvm-auto-clean-trigger

Whitespace-only changes.

0 commit comments

Comments
 (0)