diff options
| author | Fenrir <fenrirwolf@gmail.com> | 2018-01-19 01:20:34 -0700 |
|---|---|---|
| committer | Fenrir <fenrirwolf@gmail.com> | 2018-01-19 02:26:03 -0700 |
| commit | 01059b9454db83c12d0215b8bf0721d6fd69ff93 (patch) | |
| tree | 4b8b777ee3b74a327fc4008af24d165caf9086cb | |
| parent | cfba0d446e8ab90f0c81aa0942819d05621c8b8e (diff) | |
| download | rust-01059b9454db83c12d0215b8bf0721d6fd69ff93.tar.gz | |
Match libunwind's EABI selection with libpanic_unwind
| -rw-r--r-- | src/libunwind/libunwind.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs index e22f6702672..e6fff7963f7 100644 --- a/src/libunwind/libunwind.rs +++ b/src/libunwind/libunwind.rs @@ -93,8 +93,7 @@ extern "C" { } cfg_if! { -if #[cfg(not(any(all(target_os = "android", target_arch = "arm"), - all(target_os = "linux", target_arch = "arm"))))] { +if #[cfg(all(any(target_os = "ios", not(target_arch = "arm"))))] { // Not ARM EHABI #[repr(C)] #[derive(Copy, Clone, PartialEq)] |