user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #143474 - jieyouxu:bootstrap-llvm-snapshot, r=Kobzol

Browse source 
Pretend in bootstrap snapshot tests that we always build in-tree LLVM

Otherwise, depending on whether CI LLVM is inhibited or if an externally-provided LLVM is used, bootstrap host LLVM build step could be missing in step snapshots.

Note that I'm not sure if this is the *right* solution (this might be *a* solution). I imagine we do want to control for the set of configuration that these snapshot tests are run, as much as possible.

r? `@Kobzol`
This commit is contained in:
bors 2025-07-05 12:42:59 +00:00
commit 6dec76f1c2
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/bootstrap/src/utils/tests/mod.rs
View file

@ -7,6 +7,7 @@ use tempfile::TempDir;
use crate::core::builder::Builder;
use crate::core::config::DryRun;
use crate::utils::helpers::get_host_target;
use crate::{Build, Config, Flags, t};
pub mod git;
@ -91,6 +92,13 @@ impl ConfigBuilder {
self.args.push("--set".to_string());
self.args.push("build.submodules=false".to_string());
// Override any external LLVM set and inhibit CI LLVM; pretend that we're always building
// in-tree LLVM from sources.
self.args.push("--set".to_string());
self.args.push("llvm.download-ci-llvm=false".to_string());
self.args.push("--set".to_string());
self.args.push(format!("target.'{}'.llvm-config=false", get_host_target()));
// Do not mess with the local rustc checkout build directory
self.args.push("--build-dir".to_string());
self.args.push(self.directory.join("build").display().to_string());