Skip to content

Commit

Permalink
mk: Clean just one llvm build at a time. Closes #17852
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
brson committed Oct 30, 2014
1 parent 77f44d4 commit b8e7c4f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mk/llvm.mk
Expand Up @@ -38,7 +38,7 @@ endif
# the stamp in the source dir.
$$(LLVM_STAMP_$(1)): $(S)src/rustllvm/llvm-auto-clean-trigger
@$$(call E, make: cleaning llvm)
$(Q)$(MAKE) clean-llvm
$(Q)$(MAKE) clean-llvm$(1)
@$$(call E, make: done cleaning llvm)
touch $$@

Expand Down

5 comments on commit b8e7c4f

@bors
Copy link
Contributor

@bors bors commented on b8e7c4f Oct 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at brson@b8e7c4f

@bors
Copy link
Contributor

@bors bors commented on b8e7c4f Oct 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/clean-llvm = b8e7c4f into auto

@bors
Copy link
Contributor

@bors bors commented on b8e7c4f Oct 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/clean-llvm = b8e7c4f merged ok, testing candidate = d1fc2de

@bors
Copy link
Contributor

@bors bors commented on b8e7c4f Oct 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on b8e7c4f Oct 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = d1fc2de

Please sign in to comment.