diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/builder/tests.rs index 2bb90fdb04edc..9c74c353fa0bf 100644 --- a/src/bootstrap/builder/tests.rs +++ b/src/bootstrap/builder/tests.rs @@ -185,6 +185,10 @@ fn dist_only_cross_host() { compiler: Compiler { host: a, stage: 0 }, target: a, }, + compile::Rustc { + compiler: Compiler { host: a, stage: 1 }, + target: a, + }, compile::Rustc { compiler: Compiler { host: a, stage: 1 }, target: b, diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index f1baeafe26afb..d44a9d91c43e1 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -54,6 +54,10 @@ impl Step for ToolBuild { match self.mode { Mode::ToolRustc => { + // e.g. clippy wants to depend on compiler internals from + // the host, too -- this seems to be because we run rustc w/o the target flag, which + // is probably because clippy is a "plugin" so is intended for the host. + builder.ensure(compile::Rustc { compiler, target: compiler.host }); builder.ensure(compile::Rustc { compiler, target }) } Mode::ToolStd => {