Auto merge of #35489 - sanxiyn:target-list, r=alexcrichton

bors · web-flow · commit 0ef24eed2fe3 · 2016-08-10T13:13:50.000-07:00
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.
diff --git 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()
             }))
         }

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ macro_rules! supported_targets {`
`94`	`94`	`pub fn get_targets() -> Box<Iterator<Item=String>> {`
`95`	`95`	`Box::new(TARGETS.iter().filter_map(\|t\| -> Option<String> {`
`96`	`96`	`load_specific(t)`
`97`		`- .map(\|t\| t.llvm_target)`
	`97`	`+ .and(Ok(t.to_string()))`
`98`	`98`	`.ok()`
`99`	`99`	`}))`
`100`	`100`	`}`