diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-11-15 01:52:22 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-11-15 01:52:22 +0000 |
| commit | 097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf (patch) | |
| tree | daa93c64489cab0512bad7c4e5f4b3b848bf7859 /user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch | |
| parent | 950827890cca5caf633480047da6115f43b1a529 (diff) | |
| parent | 18b490b7953735328501c6f7e54522a91220caf3 (diff) | |
| download | packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.gz packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.bz2 packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.xz packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.30.1
See merge request !105
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 5a2b6c422..611a169c9 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 e3b90583112fd59255406f245db1856e0c21dab3 Mon Sep 17 00:00:00 2001 +From 1d9278c4f249cf66677a2f934d4e704f82c6fe9d 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/29] Prefer libgcc_eh over libunwind for musl +Subject: [PATCH 06/24] 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 2b3c19c067..8233beada0 100644 +index 3b94dc238d..6234ed848c 100644 --- a/src/libunwind/lib.rs +++ b/src/libunwind/lib.rs -@@ -35,6 +35,6 @@ cfg_if! { +@@ -37,6 +37,6 @@ cfg_if! { } #[cfg(target_env = "musl")] |