Skip to content

Commit 24d907a

Browse files
Rollup merge of #108212 - KittyBorgX:master, r=jyn514
Download rustfmt regardless of rustc being set in config.toml Fixes #81155 cc : #108210 for exact error details
2 parents d2aef58 + cd3d4fc commit 24d907a

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

src/bootstrap/config.rs

-9
Original file line numberDiff line numberDiff line change
@@ -1315,15 +1315,6 @@ impl Config {
13151315
} else {
13161316
RustfmtState::Unavailable
13171317
};
1318-
} else {
1319-
// If using a system toolchain for bootstrapping, see if that has rustfmt available.
1320-
let host = config.build;
1321-
let rustfmt_path = config.initial_rustc.with_file_name(exe("rustfmt", host));
1322-
let bin_root = config.out.join(host.triple).join("stage0");
1323-
if !rustfmt_path.starts_with(&bin_root) {
1324-
// Using a system-provided toolchain; we shouldn't download rustfmt.
1325-
*config.initial_rustfmt.borrow_mut() = RustfmtState::SystemToolchain(rustfmt_path);
1326-
}
13271318
}
13281319

13291320
// Now that we've reached the end of our configuration, infer the

0 commit comments

Comments
 (0)