Fix boostrap using host exe suffix for cargo

This commit is contained in:
jam1garner 2021-05-22 17:48:26 -04:00
parent f98bd7eeca
commit 903e369c83

View File

@ -217,9 +217,8 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
if tool == "tidy" { if tool == "tidy" {
tool = "rust-tidy"; tool = "rust-tidy";
} }
let cargo_out = let cargo_out = builder.cargo_out(compiler, self.mode, target).join(exe(tool, target));
builder.cargo_out(compiler, self.mode, target).join(exe(tool, compiler.host)); let bin = builder.tools_dir(compiler).join(exe(tool, target));
let bin = builder.tools_dir(compiler).join(exe(tool, compiler.host));
builder.copy(&cargo_out, &bin); builder.copy(&cargo_out, &bin);
Some(bin) Some(bin)
} }