Rollup merge of #44091 - kallisti5:haiku-fix, r=eddyb

alexcrichton · alexcrichton · commit f0ba1b98af30 · 2017-08-25T22:21:51.000-07:00
haiku/librustc_back: Remove incorrect no_integrated_as

* Makes rust bootstrap incorrectly search for xxx.s vs xxx.0.s
* Not needed or incorrect fix for another issue.
diff --git a/src/librustc_back/target/haiku_base.rs b/src/librustc_back/target/haiku_base.rs
@@ -20,7 +20,6 @@ pub fn opts() -> TargetOptions {
         target_family: Some("unix".to_string()),
         relro_level: RelroLevel::Full,
         linker_is_gnu: true,
-        no_integrated_as: true,
         .. Default::default()
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ pub fn opts() -> TargetOptions {`
`20`	`20`	`target_family: Some("unix".to_string()),`
`21`	`21`	`relro_level: RelroLevel::Full,`
`22`	`22`	`linker_is_gnu: true,`
`23`		`- no_integrated_as: true,`
`24`	`23`	`.. Default::default()`
`25`	`24`	`}`
`26`	`25`	`}`