From 5d1ee66abedd083dcbc3ee691379e43430bc3197 Mon Sep 17 00:00:00 2001 From: ozkanonur Date: Sun, 2 Apr 2023 19:00:00 +0300 Subject: [PATCH] fix `build --stage 2 compiler/rustc` panic Signed-off-by: ozkanonur --- src/bootstrap/compile.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 07c0d2233caeb..cf31d99d1b8d1 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -1295,6 +1295,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