From 7501995977d49238091b4ddee95c9595c4866ffe Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Fri, 20 May 2022 18:56:21 -0400 Subject: [PATCH] Bump LLVM fetched from CI to fix run-make --- src/bootstrap/dist.rs | 3 +++ src/bootstrap/download-ci-llvm-stamp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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