about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-07-24 14:56:01 -0400
committerSteve Klabnik <steve@steveklabnik.com>2015-07-24 14:56:01 -0400
commitbc51e800092be864eca86d9d31154e1aa4fe66a5 (patch)
tree942754a1906157bdf76c0f1f29e0eae8ac1bff49
parent0fb8ab04bcdd93f522b594da72a966f39a5268b0 (diff)
parentb208bd99209b0b26c2f4230e402ed523dcb9d928 (diff)
downloadrust-bc51e800092be864eca86d9d31154e1aa4fe66a5.tar.gz
rust-bc51e800092be864eca86d9d31154e1aa4fe66a5.zip
Rollup merge of #27137 - dhuseby:fixing_bitrig_linking, r=alexcrichton
fixes the linking error on bitrig.
-rw-r--r--src/librustc_back/target/bitrig_base.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/librustc_back/target/bitrig_base.rs b/src/librustc_back/target/bitrig_base.rs
index 9f6a1f1e530..ddb32f4625b 100644
--- a/src/librustc_back/target/bitrig_base.rs
+++ b/src/librustc_back/target/bitrig_base.rs
@@ -20,9 +20,7 @@ pub fn opts() -> TargetOptions {
         linker_is_gnu: true,
         has_rpath: true,
         position_independent_executables: true,
-        pre_link_args: vec!(
-        ),
-        archive_format: "bsd".to_string(),
+        archive_format: "gnu".to_string(),
 
         .. Default::default()
     }