wip

Author: Noratrieb

Diff for: src/bootstrap/src/core/build_steps/tool.rs

@@ -80,7 +80,12 @@ impl Step for ToolBuild {
 
         match self.mode {
             Mode::ToolRustc => {
-                let linked_against_compiler = compiler.with_stage(compiler.stage + 1);
+                // Tools built using the stage1 compiler are linked against the stage2 compiler,
+                // otherwise everything is stage2.
+                let linked_against_compiler = match compiler.stage {
+                    0 => compiler.with_stage(1),
+                    1.. => compiler.with_stage(2),
+                };
                 // When building a tool that links against rustc,
                 // we need the rustc to link against and its std to be present and ready in the syroot.
                 builder.ensure(compile::Std::new(