about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-08-26 06:46:37 -0700
committerGitHub <noreply@github.com>2017-08-26 06:46:37 -0700
commit502a11d53ed56aca9c35ae1c43117732cb221e16 (patch)
tree46bf1a244be88030becd61e496ac54c0d22b427a
parentfdf4598f8c5d74b5e66a5d5c9cc2182d79403a92 (diff)
parent6ca124bc9e6756d0f7ea2c7790251aaf531f75e4 (diff)
downloadrust-502a11d53ed56aca9c35ae1c43117732cb221e16.tar.gz
rust-502a11d53ed56aca9c35ae1c43117732cb221e16.zip
Rollup merge of #44091 - kallisti5:haiku-fix, r=eddyb
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.
-rw-r--r--src/librustc_back/target/haiku_base.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/librustc_back/target/haiku_base.rs b/src/librustc_back/target/haiku_base.rs
index 21410dcd412..112f424f7a8 100644
--- 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()
     }
 }