Skip to content

Commit

Permalink
Rollup merge of rust-lang#97238 - Mark-Simulacrum:bump-ci-llvm, r=jyn514
Browse files Browse the repository at this point in the history
Bump LLVM fetched from CI to fix run-make

cc `@yaahc,` who found this while testing locally

Ideally we'd detect this in CI and catch it, but at least we have a comment now which should hopefully prevent this from happening in the future.

r? `@pietroalbini` or `@jyn514`
  • Loading branch information
GuillaumeGomez committed May 21, 2022
2 parents b659266 + 7501995 commit 28730ac
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2038,6 +2038,9 @@ impl Step for RustDev {
tarball.set_overlay(OverlayKind::LLVM);

let src_bindir = builder.llvm_out(target).join("bin");
// If updating this list, you likely want to change
// src/bootstrap/download-ci-llvm-stamp as well, otherwise local users
// will not pick up the extra file until LLVM gets bumped.
for bin in &[
"llvm-config",
"llvm-ar",
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/download-ci-llvm-stamp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Change this file to make users of the `download-ci-llvm` configuration download
a new version of LLVM from CI, even if the LLVM submodule hasn’t changed.

Last change is for: https://github.com/rust-lang/rust/pull/94023
Last change is for: https://github.com/rust-lang/rust/pull/96867

0 comments on commit 28730ac

Please sign in to comment.