Skip to content

Commit d0eed58

Browse files
committed
Auto merge of rust-lang#108288 - ozkanonur:hotfix-90244, r=Mark-Simulacrum
fix `build --stage 2 compiler/rustc` panic Skip assembling(which causes panic due to not found `.librustc.stamp` file) process for stage3(since it has problems with sysroot) if full-bootstrap isn't used. Resolves rust-lang#90244
2 parents 3328913 + 5d1ee66 commit d0eed58

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/bootstrap/compile.rs

+7
Original file line numberDiff line numberDiff line change
@@ -1346,6 +1346,13 @@ impl Step for Assemble {
13461346
// when not performing a full bootstrap).
13471347
builder.ensure(Rustc::new(build_compiler, target_compiler.host));
13481348

1349+
// FIXME: For now patch over problems noted in #90244 by early returning here, even though
1350+
// we've not properly assembled the target sysroot. A full fix is pending further investigation,
1351+
// for now full bootstrap usage is rare enough that this is OK.
1352+
if target_compiler.stage >= 3 && !builder.config.full_bootstrap {
1353+
return target_compiler;
1354+
}
1355+
13491356
for &backend in builder.config.rust_codegen_backends.iter() {
13501357
if backend == "llvm" {
13511358
continue; // Already built as part of rustc

0 commit comments

Comments
 (0)