diff options
| author | Samuel Holland <samuel@sholland.org> | 2019-10-07 00:01:16 +0000 |
|---|---|---|
| committer | Samuel Holland <samuel@sholland.org> | 2019-10-14 22:36:45 -0500 |
| commit | 3febb3d8330926d97e865c3aeaddff95acef8b83 (patch) | |
| tree | 08b9bb19c509e2093a12b7bd53a2ac51769134f6 /user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch | |
| parent | b5b897e47ab11998c46db7f9ba96410a187c0634 (diff) | |
| download | packages-3febb3d8330926d97e865c3aeaddff95acef8b83.tar.gz packages-3febb3d8330926d97e865c3aeaddff95acef8b83.tar.bz2 packages-3febb3d8330926d97e865c3aeaddff95acef8b83.tar.xz packages-3febb3d8330926d97e865c3aeaddff95acef8b83.zip | |
user/rust: Bump to 1.38.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 | 9 |
1 files changed, 5 insertions, 4 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 2f1094448..a7899a9f6 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,17 +1,17 @@ -From 1eb558f246269606c6d8d73824ef6b44fa10764e Mon Sep 17 00:00:00 2001 +From faede4a789d3156d5c029606087851fa50d48380 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 +Subject: [PATCH 06/18] 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 +index 8d916447128..6d653d41fa4 100644 --- a/src/libunwind/lib.rs +++ b/src/libunwind/lib.rs -@@ -23,6 +23,6 @@ cfg_if::cfg_if! { +@@ -21,7 +21,7 @@ cfg_if::cfg_if! { } #[cfg(target_env = "musl")] @@ -19,6 +19,7 @@ index 9182e349b19..0377fbb58fc 100644 +#[link(name = "gcc_eh", cfg(target_feature = "crt-static"))] #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))] extern {} + -- 2.21.0 |