From 413205ed02c890584fccdcdf1c59e553a64a0ccd Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Fri, 6 Dec 2024 11:12:14 +0100
Subject: [PATCH] Disable neon for apple targets

---
 zng/cc.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/zng/cc.rs b/zng/cc.rs
index efda22fc..c0b365a2 100644
--- a/zng/cc.rs
+++ b/zng/cc.rs
@@ -149,7 +149,7 @@ pub fn build_zlib_ng(target: &str, compat: bool) {
             "crc32_braid_c",
             "crc32_fold_c",
             "slide_hash_c",
-        ]
+        ],
     );
 
     if compat {
@@ -196,7 +196,8 @@ pub fn build_zlib_ng(target: &str, compat: bool) {
             .flag("-fvisibility=hidden");
     }
 
-    if target.contains("apple") {
+    let is_apple = target.contains("apple");
+    if is_apple {
         cfg.define("_C99_SOURCE", None);
     } else if target.contains("solaris") {
         cfg.define("_XOPEN_SOURCE", "700");
@@ -322,7 +323,8 @@ pub fn build_zlib_ng(target: &str, compat: bool) {
             // neon
             // Fix armv7-unknown-linux-musleabi and arm-unknown-linux-musleabi by only
             // passing in ARM_NEON if that target is enabled.
-            if features.split(",").any(|name| name == "neon") {
+            // Disable for apple targets due to https://github.com/rust-lang/libz-sys/issues/230
+            if !is_apple && features.split(",").any(|name| name == "neon") {
                 cfg.define("ARM_NEON", None);
             }