diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-02-29 02:16:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-29 02:16:23 +0100 |
| commit | 1bb6760968b92acee0a1f9f7d84fa10805157b59 (patch) | |
| tree | 3b148d365795aea32af6175d266b5bd2ba3ae3e9 | |
| parent | c8db7dcc1cd91366dda9bea92e38b5d215ede1f1 (diff) | |
| parent | 7cf2bfb6578281b568735847549305059a3d6a48 (diff) | |
| download | rust-1bb6760968b92acee0a1f9f7d84fa10805157b59.tar.gz rust-1bb6760968b92acee0a1f9f7d84fa10805157b59.zip | |
Rollup merge of #69563 - andre-richter:fix_no_std_match, r=Mark-Simulacrum
Fix no_std detection for target triples The current check for wether a target is no_std or not is matching for the string `-none-` in a target triple. This doesn't work for triples that end in `-none`, like `aarch64-unknown-none`. Fix this by matching for `-none` instead. I checked for all the current target triples containing `none`, and this should not generate any false positives. This fixes an issue encountered in https://github.com/rust-lang/rust/pull/68334
| -rw-r--r-- | src/bootstrap/config.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 746cddbabd6..56164b74f30 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -180,7 +180,7 @@ pub struct Target { impl Target { pub fn from_triple(triple: &str) -> Self { let mut target: Self = Default::default(); - if triple.contains("-none-") || triple.contains("nvptx") { + if triple.contains("-none") || triple.contains("nvptx") { target.no_std = true; } target |