diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-08-13 21:11:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-13 21:11:15 +0200 |
| commit | c013e2c3df97b7ebb5990fc02063168902ec4815 (patch) | |
| tree | a6ee494d5be3a9e37ec0f43a6f7bbde7f4127077 | |
| parent | 5ef33d4c61684499a17791220b9b73b2117092b5 (diff) | |
| parent | 87a4c325d2767e5e0baf0c2a4d0cc12bb78ca356 (diff) | |
| download | rust-c013e2c3df97b7ebb5990fc02063168902ec4815.tar.gz rust-c013e2c3df97b7ebb5990fc02063168902ec4815.zip | |
Rollup merge of #129056 - Kobzol:fix-target-triple, r=onur-ozkan
Fix one usage of target triple in bootstrap This bug was introduced in https://github.com/rust-lang/rust/pull/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](https://github.com/rust-lang/rust/pull/128983#issuecomment-2286601889). r? `@onur-ozkan`
| -rw-r--r-- | src/bootstrap/src/core/download.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/download.rs b/src/bootstrap/src/core/download.rs index 8131666fcb2..fd85650bc56 100644 --- a/src/bootstrap/src/core/download.rs +++ b/src/bootstrap/src/core/download.rs @@ -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"); |