Skip to content

Commit 28730ac

Browse files
Rollup merge of rust-lang#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`
2 parents b659266 + 7501995 commit 28730ac

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/bootstrap/dist.rs

+3
Original file line numberDiff line numberDiff line change
@@ -2038,6 +2038,9 @@ impl Step for RustDev {
20382038
tarball.set_overlay(OverlayKind::LLVM);
20392039

20402040
let src_bindir = builder.llvm_out(target).join("bin");
2041+
// If updating this list, you likely want to change
2042+
// src/bootstrap/download-ci-llvm-stamp as well, otherwise local users
2043+
// will not pick up the extra file until LLVM gets bumped.
20412044
for bin in &[
20422045
"llvm-config",
20432046
"llvm-ar",

src/bootstrap/download-ci-llvm-stamp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Change this file to make users of the `download-ci-llvm` configuration download
22
a new version of LLVM from CI, even if the LLVM submodule hasn’t changed.
33

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

0 commit comments

Comments
 (0)