diff options
author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-28 16:46:04 +0000 |
---|---|---|
committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-28 16:46:04 +0000 |
commit | 7f660eb77c44872fe454eaf31b543969630670f3 (patch) | |
tree | c657ba5ee86a0f2021388bd4ff08e3b3a80dae4e /user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch | |
parent | d7c07ebaf84058b90112193bf3953289c280a1a6 (diff) | |
parent | bdb273539df454bdd85dcfb37f7c0135d33477f8 (diff) | |
download | packages-7f660eb77c44872fe454eaf31b543969630670f3.tar.gz packages-7f660eb77c44872fe454eaf31b543969630670f3.tar.bz2 packages-7f660eb77c44872fe454eaf31b543969630670f3.tar.xz packages-7f660eb77c44872fe454eaf31b543969630670f3.zip |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.37.0
See merge request adelie/packages!270
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 | 8 |
1 files changed, 4 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 38065f96c..2f1094448 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 e74e7ab193b0d59302eac1edbab423f2e83e986d Mon Sep 17 00:00:00 2001 +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/13] Prefer libgcc_eh over libunwind for musl +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 0ccffea317..935175dd8d 100644 +index 9182e349b19..0377fbb58fc 100644 --- a/src/libunwind/lib.rs +++ b/src/libunwind/lib.rs -@@ -26,6 +26,6 @@ cfg_if! { +@@ -23,6 +23,6 @@ cfg_if::cfg_if! { } #[cfg(target_env = "musl")] |