diff options
| author | Samuel Holland <samuel@sholland.org> | 2022-04-30 04:27:44 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-10-21 18:34:01 -0500 |
| commit | 36ba9dd47f31bfbe4811b03df9a2871c43857219 (patch) | |
| tree | 2637bf028a2ab8f6e4598f11b1afb84824fdcb64 /user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch | |
| parent | 04e62b2391dc7f829349c87e1cc71597731e3c88 (diff) | |
| download | packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.gz packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.bz2 packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.xz packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.zip | |
user/rust: Bump to 1.60.0
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch')
| -rw-r--r-- | user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch index a7899a9f6..27b3cd547 100644 --- a/user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch +++ b/user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch @@ -1,25 +1,25 @@ -From faede4a789d3156d5c029606087851fa50d48380 Mon Sep 17 00:00:00 2001 +From 78ae73f09d07c847ede1dc683b8907f5bd5bd17f 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/18] Prefer libgcc_eh over libunwind for musl +Subject: [PATCH 06/14] Prefer libgcc_eh over libunwind for musl --- - src/libunwind/lib.rs | 2 +- + library/unwind/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs -index 8d916447128..6d653d41fa4 100644 ---- a/src/libunwind/lib.rs -+++ b/src/libunwind/lib.rs -@@ -21,7 +21,7 @@ cfg_if::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 {} - +diff --git a/library/unwind/src/lib.rs b/library/unwind/src/lib.rs +index 079626f0fea..590fca0acfa 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", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))] + #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))] + extern "C" {} + } -- -2.21.0 +2.35.1 |