Skip to content

Commit d1fc2de

Browse files
committed
auto merge of #18448 : brson/rust/clean-llvm, r=alexcrichton
When building for multiple targets, the initial 'make' invocation always fails. The missing build stamp causes clean-llvm to be invoked, but clean-llvm cleans *all* llvm builds. So what happens is that 1) all llvm's are cleaned (a no-op), 2) llvm-${target1} builds, 3) all llvm's are cleaned (deleting llvm-${target1}), 4) llvm-${target2} is built, 5) the remaining build for ${target1} fails because llvm does not exist. This makes the clean operation only clean the correct llvm build. Should greatly reduce bot failures.
2 parents 15dd90b + b8e7c4f commit d1fc2de

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mk/llvm.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ endif
3838
# the stamp in the source dir.
3939
$$(LLVM_STAMP_$(1)): $(S)src/rustllvm/llvm-auto-clean-trigger
4040
@$$(call E, make: cleaning llvm)
41-
$(Q)$(MAKE) clean-llvm
41+
$(Q)$(MAKE) clean-llvm$(1)
4242
@$$(call E, make: done cleaning llvm)
4343
touch $$@
4444

0 commit comments

Comments
 (0)