diff options
| author | ozkanonur <work@onurozkan.dev> | 2023-04-02 19:00:00 +0300 |
|---|---|---|
| committer | ozkanonur <work@onurozkan.dev> | 2023-04-02 19:00:00 +0300 |
| commit | 5d1ee66abedd083dcbc3ee691379e43430bc3197 (patch) | |
| tree | ecdec0e720933bb44fed2f6f3735fb3b8259fcff | |
| parent | ea218392a4ce119c4dfcd8fb94a7fee77f76f2c5 (diff) | |
| download | rust-5d1ee66abedd083dcbc3ee691379e43430bc3197.tar.gz rust-5d1ee66abedd083dcbc3ee691379e43430bc3197.zip | |
fix `build --stage 2 compiler/rustc` panic
Signed-off-by: ozkanonur <work@onurozkan.dev>
| -rw-r--r-- | src/bootstrap/compile.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 07c0d2233ca..cf31d99d1b8 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 |
