diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-04-06 20:22:35 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-04-06 20:22:35 +0000 |
| commit | 7b77e0c080a78c2525e286e41b3721393f79fa8f (patch) | |
| tree | 2580c195af5f6405fc74b0415211da14a416c39b /user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch | |
| parent | 8c2a854351b6ea35aed27d44baff826f400a0497 (diff) | |
| parent | fd100f124927cd65cf821bd5d538815e81034c1b (diff) | |
| download | packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.tar.gz packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.tar.bz2 packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.tar.xz packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.33.0
See merge request !205
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 | 10 |
1 files changed, 5 insertions, 5 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 e3a4b47cf..f7f7ccd3e 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 916ce9740ddd2e41a567f821f9c0e86faa3c8269 Mon Sep 17 00:00:00 2001 +From eb2340bd8c8d9e79eb4bb231ccb31cd4e4bba907 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/23] Prefer libgcc_eh over libunwind for musl +Subject: [PATCH 06/14] 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 954eb9d6d0..a127aa5d96 100644 +index 7ed7837268..2f38a43845 100644 --- a/src/libunwind/lib.rs +++ b/src/libunwind/lib.rs -@@ -36,6 +36,6 @@ cfg_if! { +@@ -26,6 +26,6 @@ cfg_if! { } #[cfg(target_env = "musl")] @@ -20,5 +20,5 @@ index 954eb9d6d0..a127aa5d96 100644 #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))] extern {} -- -2.19.2 +2.21.0 |