diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-07-24 05:05:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-24 05:05:37 +0200 |
| commit | 1fe9726c954ff24c47b6e3665094cef58637c8ad (patch) | |
| tree | e076be143521de65d8a7319307b1ff57676ec5df /src | |
| parent | 888422880c161fa087385de9d8984f6e1ed848a3 (diff) | |
| parent | 2f55cedf501e06f932787248a17e6aaffd9785f1 (diff) | |
| download | rust-1fe9726c954ff24c47b6e3665094cef58637c8ad.tar.gz rust-1fe9726c954ff24c47b6e3665094cef58637c8ad.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/src/core/build_steps/compile.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs index 3e79acad1c4..9bbebf9b870 100644 --- a/src/bootstrap/src/core/build_steps/compile.rs +++ b/src/bootstrap/src/core/build_steps/compile.rs @@ -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, |