diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2021-05-20 17:56:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-20 17:56:51 +0200 |
| commit | ddc376c03d13931bbba5550d6e8436e6ee8173cb (patch) | |
| tree | 002bb6db6850869f7edad1aab3477aa8501eb87b /src/bootstrap | |
| parent | 0d3bee8be03e58cfe0295a775961a4daa2ea2fd1 (diff) | |
| parent | 9719031dd9e2c546da32710d6e816e3bfa7f0151 (diff) | |
| download | rust-ddc376c03d13931bbba5550d6e8436e6ee8173cb.tar.gz rust-ddc376c03d13931bbba5550d6e8436e6ee8173cb.zip | |
Rollup merge of #85326 - infinity0:fix-cross-compile-tools, r=Mark-Simulacrum
bootstrap: ensure host std when cross-compiling tools, fixes #85320
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/tool.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index dd8c6023a44..98b5bfd3b98 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -52,7 +52,10 @@ impl Step for ToolBuild { let is_optional_tool = self.is_optional_tool; match self.mode { - Mode::ToolRustc => builder.ensure(compile::Rustc { compiler, target }), + Mode::ToolRustc => { + builder.ensure(compile::Std { compiler, target: compiler.host }); + builder.ensure(compile::Rustc { compiler, target }); + } Mode::ToolStd => builder.ensure(compile::Std { compiler, target }), Mode::ToolBootstrap => {} // uses downloaded stage0 compiler libs _ => panic!("unexpected Mode for tool build"), |