Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions zng/cc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ pub fn build_zlib_ng(target: &str, compat: bool) {
"crc32_braid_c",
"crc32_fold_c",
"slide_hash_c",
]
],
);

if compat {
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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);
}

Expand Down
Loading