Bump LLVM fetched from CI to fix run-make

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 16727f4398dff5c425fe9aaff6472beca5a0b0c2..a6fb72c03f3dd35ea2ada2d4d28e297de44d753d 100644 (file)
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -2038,6 +2038,9 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
         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 20a98111bebaa420f4a5285371904b0252b7e6d7..19504a51a584b1af9f19cc4ba78865b72b81cd5c 100644 (file)
--- 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