Rollup merge of #128108 - onur-ozkan:ensure-std-for-precompiled-rustc, r=Kobzol

ensure std step before preparing sysroot

When using download-rustc, any stage other than 0 or 1 (e.g., cargo +stage2 build/doc) will fail to find std while compiling on simple rust sources. Ensuring the std step fixes this issue.

r? Kobzol
This commit is contained in:
Matthias Krüger 2024-07-24 05:05:37 +02:00 committed by GitHub
commit 1fe9726c95
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1700,6 +1700,7 @@ impl Step for Assemble {
// If we're downloading a compiler from CI, we can use the same compiler for all stages other than 0.
if builder.download_rustc() {
builder.ensure(Std::new(target_compiler, target_compiler.host));
let sysroot =
builder.ensure(Sysroot { compiler: target_compiler, force_recompile: false });
// Ensure that `libLLVM.so` ends up in the newly created target directory,