diff options
| author | bors <bors@rust-lang.org> | 2016-08-10 13:13:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-10 13:13:50 -0700 |
| commit | 0ef24eed2fe3bfdd050e246327332fadb5985a6a (patch) | |
| tree | 38d05af28aa2a233900e99bcd7a2eec4de528ce9 | |
| parent | 1f2ae3849cf024457253be745ff514a403e90b44 (diff) | |
| parent | dc7407c77a5a21ebb1aa2229e65554df256601d9 (diff) | |
| download | rust-0ef24eed2fe3bfdd050e246327332fadb5985a6a.tar.gz rust-0ef24eed2fe3bfdd050e246327332fadb5985a6a.zip | |
Auto merge of #35489 - sanxiyn:target-list, r=alexcrichton
Print Rust target name, not LLVM target name, for `--print target-list` Rust target name and LLVM target name are usually the same, but not always. For example, `arm-unknown-linux-musleabi` Rust target uses `arm-unknown-linux-gnueabi` LLVM target. Fix #35481.
| -rw-r--r-- | src/librustc_back/target/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs index 3d24fd8ab67..18686e3f1d6 100644 --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs @@ -94,7 +94,7 @@ macro_rules! supported_targets { pub fn get_targets() -> Box<Iterator<Item=String>> { Box::new(TARGETS.iter().filter_map(|t| -> Option<String> { load_specific(t) - .map(|t| t.llvm_target) + .and(Ok(t.to_string())) .ok() })) } |
