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

fix #102002, Delete the stage1 and stage0-sysroot directories when using download-rustc

Browse source
This commit is contained in:
yukang 2022-09-20 00:53:46 +08:00
parent 11bb80a92b
commit 973ff033f3
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/bootstrap/compile.rs
View file

@ -1099,10 +1099,11 @@ impl Step for Sysroot {
/// 1-3.
fn run(self, builder: &Builder<'_>) -> Interned<PathBuf> {
let compiler = self.compiler;
let host_dir = builder.out.join(&compiler.host.triple);
let sysroot = if compiler.stage == 0 {
builder.out.join(&compiler.host.triple).join("stage0-sysroot")
host_dir.join("stage0-sysroot")
} else {
builder.out.join(&compiler.host.triple).join(format!("stage{}", compiler.stage))
host_dir.join(format!("stage{}", compiler.stage))
};
let _ = fs::remove_dir_all(&sysroot);
t!(fs::create_dir_all(&sysroot));
@ -1113,6 +1114,11 @@ impl Step for Sysroot {
builder.config.build, compiler.host,
"Cross-compiling is not yet supported with `download-rustc`",
);
// #102002, cleanup stage1 and stage0-sysroot folders when using download-rustc
let _ = fs::remove_dir_all(host_dir.join("stage1"));
let _ = fs::remove_dir_all(host_dir.join("stage0-sysroot"));
// Copy the compiler into the correct sysroot.
let ci_rustc_dir =
builder.config.out.join(&*builder.config.build.triple).join("ci-rustc");

6
src/bootstrap/tool.rs
View file

@ -512,8 +512,10 @@ impl Step for Rustdoc {
// Similar to `compile::Assemble`, build with the previous stage's compiler. Otherwise
// we'd have stageN/bin/rustc and stageN/bin/rustdoc be effectively different stage
// compilers, which isn't what we want. Rustdoc should be linked in the same way as the
// rustc compiler it's paired with, so it must be built with the previous stage compiler.
let build_compiler = builder.compiler(target_compiler.stage - 1, builder.config.build);
// rustc compiler it's paired with, so it must be built with the previous stage compiler,
// if download_rustc is true, we will use the same target stage.
let target_stage = target_compiler.stage - if builder.download_rustc() { 0 } else { 1 };
let build_compiler = builder.compiler(target_stage, builder.config.build);
// When using `download-rustc` and a stage0 build_compiler, copying rustc doesn't actually
// build stage0 libstd (because the libstd in sysroot has the wrong ABI). Explicitly build