Skip to content

Commit

Permalink
Auto merge of rust-lang#108288 - ozkanonur:hotfix-90244, r=Mark-Simul…
Browse files Browse the repository at this point in the history
…acrum

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
  • Loading branch information
bors committed Apr 3, 2023
2 parents 3328913 + 5d1ee66 commit d0eed58
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/bootstrap/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1346,6 +1346,13 @@ impl Step for Assemble {
// when not performing a full bootstrap).
builder.ensure(Rustc::new(build_compiler, target_compiler.host));

// FIXME: For now patch over problems noted in #90244 by early returning here, even though
// we've not properly assembled the target sysroot. A full fix is pending further investigation,
// for now full bootstrap usage is rare enough that this is OK.
if target_compiler.stage >= 3 && !builder.config.full_bootstrap {
return target_compiler;
}

for &backend in builder.config.rust_codegen_backends.iter() {
if backend == "llvm" {
continue; // Already built as part of rustc
Expand Down

0 comments on commit d0eed58

Please sign in to comment.