diff options
| author | Shiz <hi@shiz.me> | 2017-04-27 22:06:05 +0000 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-04-28 03:02:30 +0200 |
| commit | 1ccf62eb0d27f63f20055c1458f9a6ba75b6032c (patch) | |
| tree | e40322336efe91be52be95bbfc69ccfc9181d11b /testing/rust/musl-fix-static-linking.patch | |
| parent | 22c1288141f8bba1d3801cc9d756a10334fbd091 (diff) | |
| download | aports-1ccf62eb0d27f63f20055c1458f9a6ba75b6032c.tar.bz2 aports-1ccf62eb0d27f63f20055c1458f9a6ba75b6032c.tar.xz | |
testing/rust: upgrade to 1.17.0
Diffstat (limited to 'testing/rust/musl-fix-static-linking.patch')
| -rw-r--r-- | testing/rust/musl-fix-static-linking.patch | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/testing/rust/musl-fix-static-linking.patch b/testing/rust/musl-fix-static-linking.patch index 786b7d3a41..85de05e542 100644 --- a/testing/rust/musl-fix-static-linking.patch +++ b/testing/rust/musl-fix-static-linking.patch @@ -77,7 +77,9 @@ static linking is requested, instead of dynamically as before. // 1. The local object that LLVM just generated // 2. Local native libraries // 3. Upstream rust libraries -@@ -888,17 +881,12 @@ +--- a/src/librustc_trans/back/link.rs ++++ b/src/librustc_trans/back/link.rs +@@ -951,17 +951,12 @@ // list can't depend on items higher up in the list. For example nothing can // depend on what we just generated (e.g. that'd be a circular dependency). // Upstream rust libraries are not allowed to depend on our local native @@ -93,7 +95,7 @@ static linking is requested, instead of dynamically as before. + cmd.start_group(); add_local_native_libraries(cmd, sess); add_upstream_rust_crates(cmd, sess, crate_type, tmpdir); - add_upstream_native_libraries(cmd, sess); + add_upstream_native_libraries(cmd, sess, crate_type); + cmd.end_group(); // # Telling the linker what we're doing @@ -170,3 +172,29 @@ static linking is requested, instead of dynamically as before. } } +@@ -562,6 +562,10 @@ + // noop + } + ++ fn static_executable(&mut self) { ++ // noop ++ } ++ + fn args(&mut self, args: &[String]) { + self.cmd.args(args); + } +@@ -657,6 +661,14 @@ + + fn subsystem(&mut self, _subsystem: &str) { + // noop ++ } ++ ++ fn start_group(&mut self) { ++ self.cmd.arg("-Wl,-("); ++ } ++ ++ fn end_group(&mut self) { ++ self.cmd.arg("-Wl,-)"); + } + } + |