From 798312414b5cd58200cdee93489ba376381bb394 Mon Sep 17 00:00:00 2001 From: Thomas Yau Date: Tue, 18 Nov 2025 20:37:41 +0800 Subject: [PATCH 1/2] wolfssl-sys: Only exclude iOS x86_64 simulator from having hardware optimisations Mac catalyst now lacks hardware optimisations build flags, so we update it to only exclude iOS x86_64 simulator. --- wolfssl-sys/build.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wolfssl-sys/build.rs b/wolfssl-sys/build.rs index 2f853965..cd638106 100644 --- a/wolfssl-sys/build.rs +++ b/wolfssl-sys/build.rs @@ -366,7 +366,10 @@ fn build_wolfssl(wolfssl_src: &Path) -> PathBuf { } build_target::Arch::X86_64 => { // We don't need these build flag for iOS simulator - if build_target::target_os() != build_target::Os::iOS { + if !(build_target::target_os() == build_target::Os::iOS + && build_target::target_env() + == build_target::Env::Other(String::from("sim")).into()) + { // Enable Intel ASM optmisations conf.enable("intelasm", None); // Enable AES hardware acceleration From 126977dff53a2cc5aa5816bd905db48f9df18ab2 Mon Sep 17 00:00:00 2001 From: Thomas Yau Date: Tue, 18 Nov 2025 20:47:06 +0800 Subject: [PATCH 2/2] wolfssl-sys: Update macabi to read from build_target instead Read target environment from build_target instead for uniformity. --- wolfssl-sys/build.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wolfssl-sys/build.rs b/wolfssl-sys/build.rs index cd638106..fbd29c4d 100644 --- a/wolfssl-sys/build.rs +++ b/wolfssl-sys/build.rs @@ -458,7 +458,9 @@ fn build_wolfssl(wolfssl_src: &Path) -> PathBuf { } // Check if we are building for Mac Catalyst or iOS device - let arm64_arch = if env::var("CARGO_CFG_TARGET_ABI").unwrap_or_default() == "macabi" { + let arm64_arch = if build_target::target_env() + == build_target::Env::Other(String::from("macabi")).into() + { "arm64-apple-darwin" } else { "arm64-apple-ios"