diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2022-05-21 11:39:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-21 11:39:54 +0200 |
| commit | 28730acdbe1f8f1d51066c02b418d737b8d15338 (patch) | |
| tree | 02bb98b8c66f94d54300dd4a05eacf956f0f922c | |
| parent | b659266b88de9da759f29f5dcd4e473d84fe1b89 (diff) | |
| parent | 7501995977d49238091b4ddee95c9595c4866ffe (diff) | |
| download | rust-28730acdbe1f8f1d51066c02b418d737b8d15338.tar.gz rust-28730acdbe1f8f1d51066c02b418d737b8d15338.zip | |
Rollup merge of #97238 - Mark-Simulacrum:bump-ci-llvm, r=jyn514
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`
| -rw-r--r-- | src/bootstrap/dist.rs | 3 | ||||
| -rw-r--r-- | src/bootstrap/download-ci-llvm-stamp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 16727f4398d..a6fb72c03f3 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -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", diff --git a/src/bootstrap/download-ci-llvm-stamp b/src/bootstrap/download-ci-llvm-stamp index 20a98111beb..19504a51a58 100644 --- a/src/bootstrap/download-ci-llvm-stamp +++ b/src/bootstrap/download-ci-llvm-stamp @@ -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 |