Skip to content

Commit

Permalink
Rollup merge of rust-lang#129056 - Kobzol:fix-target-triple, r=onur-o…
Browse files Browse the repository at this point in the history
…zkan

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`
  • Loading branch information
matthiaskrgr authored Aug 13, 2024
2 parents 5ef33d4 + 87a4c32 commit c013e2c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/download.rs
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ impl Config {
extra_components: &[&str],
download_component: fn(&Config, String, &str, &str),
) {
let host = self.build;
let host = self.build.triple;
let bin_root = self.out.join(host).join(sysroot);
let rustc_stamp = bin_root.join(".rustc-stamp");

Expand Down

0 comments on commit c013e2c

Please sign in to comment.