25 lines
734 B
Diff
25 lines
734 B
Diff
|
From b8815ecb4ec9ecf7c2469703005bede91c0f6f82 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/12] 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 0ccffea31..935175dd8 100644
|
||
|
|
--- a/src/libunwind/lib.rs
|
||
|
|
+++ b/src/libunwind/lib.rs
|
||
|
|
@@ -26,6 +26,6 @@ cfg_if! {
|
||
|
|
}
|
||
|
|
|
||
|
|
#[cfg(target_env = "musl")]
|
||
|
|
-#[link(name = "unwind", kind = "static", 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 {}
|
||
|
|
--
|
||
|
|
2.22.0
|
||
|
|
|