summaryrefslogtreecommitdiff
path: root/repo/devel/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
diff options
context:
space:
mode:
authordavidovski <david@davidovski.xyz>2022-05-25 22:50:03 +0100
committerdavidovski <david@davidovski.xyz>2022-05-25 22:50:03 +0100
commit7b0628f037dcbf85cfb381d5e05dea39a2059d33 (patch)
tree4a534ef861d19cdf5235b504af5be2a5d0becb71 /repo/devel/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
parent79062a39e9bcb9731adbacd0bd9bcd0b59d19d0a (diff)
fixed various broken dependencies
Diffstat (limited to 'repo/devel/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch')
-rw-r--r--repo/devel/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/repo/devel/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/repo/devel/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
new file mode 100644
index 0000000..30cb66f
--- /dev/null
+++ b/repo/devel/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
@@ -0,0 +1,24 @@
+Additions for build.rs by q66, necessary for our musl setup.
+
+From 1eb558f246269606c6d8d73824ef6b44fa10764e Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Sat, 9 Sep 2017 00:14:16 -0500
+Subject: [PATCH 06/16] Prefer libgcc_eh over libunwind for musl
+
+---
+ src/libunwind/lib.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs
+index 9182e349b19..0377fbb58fc 100644
+--- a/library/unwind/src/lib.rs
++++ b/library/unwind/src/lib.rs
+@@ -51,7 +51,7 @@
+ #[link(name = "unwind", cfg(not(target_feature = "crt-static")))]
+ extern "C" {}
+ } else {
+- #[link(name = "unwind", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
++ #[link(name = "gcc_eh", cfg(target_feature = "crt-static"))]
+ #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
+ extern "C" {}
+ }