Merge pull request #148 from rust-cross/aarch64-armv8-a

Fix build for aarch64 linux with `-march=armv8-a`
rust-cross · Jul 6, 2023 · 832bed2 · 832bed2
2 parents e5f8504 + 11b4877
commit 832bed2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 27 deletions.
diff --git a/src/zig.rs b/src/zig.rs
@@ -143,12 +143,21 @@ impl Zig {
                     return None;
                 } else if is_riscv64 {
                     return Some("-march=generic_rv64".to_string());
-                } else if arg.starts_with("-march=armv8-a")
-                    && target
+                } else if arg.starts_with("-march=armv8-a") {
+                    if target
                         .map(|x| x.starts_with("aarch64-macos"))
                         .unwrap_or_default()
-                {
-                    return Some(arg.replace("armv8-a", "apple_a14"));
+                    {
+                        return Some(arg.replace("armv8-a", "apple_a14"));
+                    } else if target
+                        .map(|x| x.starts_with("aarch64-linux"))
+                        .unwrap_or_default()
+                    {
+                        return Some(
+                            arg.replace("armv8-a", "generic+v8a")
+                                .replace("simd", "neon"),
+                        );
+                    }
                 }
             }
             Some(arg.to_string())

diff --git a/tests/hello-cmake/Cargo.lock b/tests/hello-cmake/Cargo.lock
diff --git a/tests/hello-cmake/Cargo.toml b/tests/hello-cmake/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-libz-sys = { version = "1.1.8", default-features = false, features = ["zlib-ng"] }
+libz-ng-sys = "1.1.9"
diff --git a/tests/hello-cmake/src/main.rs b/tests/hello-cmake/src/main.rs
@@ -1,6 +1,6 @@
 use std::ffi::CStr;
 
-use libz_sys::zlibVersion;
+use libz_ng_sys::zlibVersion;
 
 fn main() {
     let ver = unsafe { zlibVersion() };