testing/rust: fix multiple issues with static/dynamic linking

1 files changed, 23 insertions, 0 deletions

diff --git a/testing/rust/remove-crt-static-from-stdlibs.patch b/testing/rust/remove-crt-static-from-stdlibs.patch
new file mode 100644
index 0000000000..d27a0f74c1
--- /dev/null
+++ b/testing/rust/remove-crt-static-from-stdlibs.patch
@@ -0,0 +1,23 @@
+--- a/src/liblibc/src/unix/mod.rs
++++ b/src/liblibc/src/unix/mod.rs
+@@ -210,8 +210,7 @@ cfg_if! {
+         // cargo build, don't pull in anything extra as the libstd  dep
+         // already pulls in all libs.
+-    } else if #[cfg(any(all(target_env = "musl", not(target_arch = "mips"))))] {
++    } else if #[cfg(target_env = "musl")] {
+-        #[link(name = "c", kind = "static", cfg(target_feature = "crt-static"))]
+-        #[link(name = "c", cfg(not(target_feature = "crt-static")))]
++        #[link(name = "c")]
+         extern {}
+     } else if #[cfg(target_os = "emscripten")] {
+         #[link(name = "c")]
+--- a/src/libunwind/lib.rs
++++ b/src/libunwind/lib.rs
+@@ -30,6 +30,5 @@
+ pub use libunwind::*;
+ 
+ #[cfg(target_env = "musl")]
+-#[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))]
+-#[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
++#[link(name = "unwind")]
+ extern {}