diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-03-12 19:18:05 +0100 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-03-13 19:52:51 +0100 |
| commit | 346bafbce4d53346ba4eeb13ae0b95545aa2c0a2 (patch) | |
| tree | cbaf67b9f040b648e233986447b992595432dd4d /community/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch | |
| parent | c7c8a969e6c5b1e0f020367b8838a64b3b947021 (diff) | |
| download | aports-346bafbce4d53346ba4eeb13ae0b95545aa2c0a2.tar.bz2 aports-346bafbce4d53346ba4eeb13ae0b95545aa2c0a2.tar.xz | |
community/rust: upgrade to 1.42.0
Diffstat (limited to 'community/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch')
| -rw-r--r-- | community/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/community/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/community/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch index d32841103a..61a2d28e2c 100644 --- a/community/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch +++ b/community/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch @@ -25,13 +25,13 @@ diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs index f24d957..28828e5 100644 --- a/src/libunwind/build.rs +++ b/src/libunwind/build.rs -@@ -5,15 +5,11 @@ fn main() { +@@ -5,15 +5,12 @@ let target = env::var("TARGET").expect("TARGET was not set"); - if cfg!(feature = "llvm-libunwind") && -- ((target.contains("linux") && !target.contains("musl")) || -- target.contains("fuchsia")) { -+ (target.contains("linux") || target.contains("fuchsia")) { + if cfg!(feature = "llvm-libunwind") +- && ((target.contains("linux") && !target.contains("musl")) || target.contains("fuchsia")) ++ && (target.contains("linux") || target.contains("fuchsia")) + { // Build the unwinding from libunwind C/C++ source code. llvm_libunwind::compile(); } else if target.contains("linux") { @@ -43,7 +43,7 @@ index f24d957..28828e5 100644 println!("cargo:rustc-link-lib=gcc_s"); } } else if target.contains("freebsd") { -@@ -99,15 +95,6 @@ mod llvm_libunwind { +@@ -105,15 +102,6 @@ cfg.file(root.join("src").join(src)); } |