Skip to content

Commit c013e2c

Browse files
authored
Rollup merge of rust-lang#129056 - Kobzol:fix-target-triple, r=onur-ozkan
Fix one usage of target triple in bootstrap This bug was introduced in rust-lang#128983. In this one case, the `TargetSelection` was also used as `Display` (not just as `Path`), which I did not notice in the original PR. If the target contained a custom file, it would be included in its `Display` formatting, even though only the triple should be used. Found [here](rust-lang#128983 (comment)). r? `@onur-ozkan`
2 parents 5ef33d4 + 87a4c32 commit c013e2c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Diff for: src/bootstrap/src/core/download.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ impl Config {
519519
extra_components: &[&str],
520520
download_component: fn(&Config, String, &str, &str),
521521
) {
522-
let host = self.build;
522+
let host = self.build.triple;
523523
let bin_root = self.out.join(host).join(sysroot);
524524
let rustc_stamp = bin_root.join(".rustc-stamp");
525525

0 commit comments

Comments
 (0)