From 0c9c5f8c93e636078d89eb27abc68b45306a16ce Mon Sep 17 00:00:00 2001 From: Shiz Date: Wed, 12 Apr 2017 19:52:52 +0000 Subject: testing/rust: link libunwind properly and clean up libc link patch --- testing/rust/remove-crt-static-from-stdlibs.patch | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 testing/rust/remove-crt-static-from-stdlibs.patch (limited to 'testing/rust/remove-crt-static-from-stdlibs.patch') diff --git a/testing/rust/remove-crt-static-from-stdlibs.patch b/testing/rust/remove-crt-static-from-stdlibs.patch deleted file mode 100644 index d27a0f74c1..0000000000 --- a/testing/rust/remove-crt-static-from-stdlibs.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 {} -- cgit v1.2.3