Luke Jones 2017-10-17 23:36:27 +00:00 committed by Git OBS Bridge
parent 6ac0b3d718
commit 19b4091847

View File

@ -20,16 +20,16 @@ Forwarded: no
--- a/src/librustc_trans/back/link.rs --- a/src/librustc_trans/back/link.rs
+++ b/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs
@@ -1017,12 +1017,6 @@ @@ -1017,6 +1017,12 @@
cmd.args(&rpath::get_rpath_flags(&mut rpath_config)); cmd.args(&rpath::get_rpath_flags(&mut rpath_config));
} }
- if (crate_type == config::CrateTypeDylib || crate_type == config::CrateTypeCdylib) && t.options.linker_is_gnu { + if (crate_type == config::CrateTypeDylib || crate_type == config::CrateTypeCdylib) && t.options.linker_is_gnu {
- let filename = String::from(out_filename.file_name().unwrap().to_str().unwrap()); + let filename = String::from(out_filename.file_name().unwrap().to_str().unwrap());
- let soname = [String::from("-Wl,-soname=") + &filename]; + let soname = [String::from("-Wl,-soname=") + &filename];
- cmd.args(&soname); + cmd.args(&soname);
- } + }
- +
// Finally add all the linker arguments provided on the command line along // Finally add all the linker arguments provided on the command line along
// with any #[link_args] attributes found inside the crate // with any #[link_args] attributes found inside the crate
if let Some(ref args) = sess.opts.cg.link_args { if let Some(ref args) = sess.opts.cg.link_args {