diff options
| author | Marat Safin <jeizsm@gmail.com> | 2017-10-18 15:22:28 +0300 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-10-23 17:40:45 +0200 |
| commit | 3f325091dd8ca8d2f89368ed44bd9cbebf25721e (patch) | |
| tree | 7e038b184ed0295db0cbd891ec433428a1d1189c /community/rust/musl-support-dynamic-linking.patch | |
| parent | 131105ff61d3bf6272f1fee753fef42f0147eff8 (diff) | |
| download | aports-3f325091dd8ca8d2f89368ed44bd9cbebf25721e.tar.bz2 aports-3f325091dd8ca8d2f89368ed44bd9cbebf25721e.tar.xz | |
community/rust: upgrade to 1.18
Diffstat (limited to 'community/rust/musl-support-dynamic-linking.patch')
| -rw-r--r-- | community/rust/musl-support-dynamic-linking.patch | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/community/rust/musl-support-dynamic-linking.patch b/community/rust/musl-support-dynamic-linking.patch index 7c4e93681b..efbbd7f0b0 100644 --- a/community/rust/musl-support-dynamic-linking.patch +++ b/community/rust/musl-support-dynamic-linking.patch @@ -303,10 +303,12 @@ index defbb44448..f10c7d5c83 100644 } { -@@ -718,8 +720,10 @@ fn link_natively(sess: &Session, - objects, out_filename, outputs, trans); +@@ -718,12 +720,14 @@ fn link_natively(sess: &Session, + cmd = linker.finalize(); + } + if let Some(args) = sess.target.target.options.late_link_args.get(&flavor) { + cmd.args(args); } - cmd.args(&sess.target.target.options.late_link_args); - for obj in &sess.target.target.options.post_link_objects { - cmd.arg(root.join(obj)); + if sess.crt_static() { @@ -314,7 +316,9 @@ index defbb44448..f10c7d5c83 100644 + cmd.arg(root.join(obj)); + } } - cmd.args(&sess.target.target.options.post_link_args); + if let Some(args) = sess.target.target.options.post_link_args.get(&flavor) { + cmd.args(args); + } diff --git a/src/libstd/build.rs b/src/libstd/build.rs index 9504194393..dd2008c206 100644 |