Skip to content

Commit 9591832

Browse files
committed
mk: add mechanisms for triggering clean-llvm builds from commits
1 parent 63afb8c commit 9591832

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

Makefile.in

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,10 +536,19 @@ ALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
536536
$(foreach host,$(CFG_HOST_TRIPLES), \
537537
all-target-$(target)-host-$(host)))
538538

539-
all: $(ALL_TARGET_RULES) $(GENERATED) docs
539+
all: rustllvm/llvm-auto-clean-stamp \
540+
$(ALL_TARGET_RULES) $(GENERATED) docs
540541

541542
endif
542543

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

544553
######################################################################
545554
# Re-configuration

mk/clean.mk

Lines changed: 1 addition & 1 deletion
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)