Skip to content

Commit dbe31bb

Browse files
authored
Rollup merge of #112477 - jyn514:assemble-info, r=clubby789
Give more helpful progress messages in `Assemble` Before (download-rustc): ``` # no output ``` After (download-rustc): ``` Creating a sysroot for stage2 compiler (use `rustup toolchain link 'name' build/host/stage2`) ``` Before (compiling from source): ``` Building compiler artifacts (stage0 -> stage1, x86_64-unknown-linux-gnu) Assembling stage1 compiler Build stage1 library artifacts (x86_64-unknown-linux-gnu -> i686-unknown-linux-gnu) Building compiler artifacts (stage0:x86_64-unknown-linux-gnu -> stage1:i686-unknown-linux-gnu) Assembling stage1 compiler (i686-unknown-linux-gnu) ``` After (compiling from source): ``` Building compiler artifacts (stage0 -> stage1, x86_64-unknown-linux-gnu) Creating a sysroot for stage1 compiler (use `rustup toolchain link 'name' build/host/stage1`) Build stage1 library artifacts (x86_64-unknown-linux-gnu) Building compiler artifacts (stage0:x86_64-unknown-linux-gnu -> stage1:i686-unknown-linux-gnu) Creating a sysroot for stage1 compiler (i686-unknown-linux-gnu) (use `rustup toolchain link 'name' build/i686-unknown-linux-gnu/stage1`) ``` cc https://rust-lang.zulipchat.com/#narrow/stream/122651-general/topic/Unable.20to.20compile.20rustc.20MSVC, https://discord.com/channels/273534239310479360/957720175619215380/1116867245499498506
2 parents e19a509 + f531fec commit dbe31bb

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

src/bootstrap/compile.rs

+14-3
Original file line numberDiff line numberDiff line change
@@ -1488,6 +1488,10 @@ impl Step for Assemble {
14881488
// Ensure that `libLLVM.so` ends up in the newly created target directory,
14891489
// so that tools using `rustc_private` can use it.
14901490
dist::maybe_install_llvm_target(builder, target_compiler.host, &sysroot);
1491+
// Lower stages use `ci-rustc-sysroot`, not stageN
1492+
if target_compiler.stage == builder.top_stage {
1493+
builder.info(&format!("Creating a sysroot for stage{stage} compiler (use `rustup toolchain link 'name' build/host/stage{stage}`)", stage=target_compiler.stage));
1494+
}
14911495
return target_compiler;
14921496
}
14931497

@@ -1525,11 +1529,18 @@ impl Step for Assemble {
15251529

15261530
let stage = target_compiler.stage;
15271531
let host = target_compiler.host;
1528-
let msg = if build_compiler.host == host {
1529-
format!("Assembling stage{} compiler", stage)
1532+
let (host_info, dir_name) = if build_compiler.host == host {
1533+
("".into(), "host".into())
15301534
} else {
1531-
format!("Assembling stage{} compiler ({})", stage, host)
1535+
(format!(" ({host})"), host.to_string())
15321536
};
1537+
// NOTE: "Creating a sysroot" is somewhat inconsistent with our internal terminology, since
1538+
// sysroots can temporarily be empty until we put the compiler inside. However,
1539+
// `ensure(Sysroot)` isn't really something that's user facing, so there shouldn't be any
1540+
// ambiguity.
1541+
let msg = format!(
1542+
"Creating a sysroot for stage{stage} compiler{host_info} (use `rustup toolchain link 'name' build/{dir_name}/stage{stage}`)"
1543+
);
15331544
builder.info(&msg);
15341545

15351546
// Link in all dylibs to the libdir

0 commit comments

Comments
 (0)