Skip to content

Commit

Permalink
Fix for aarch64-apple-ios (#604)
Browse files Browse the repository at this point in the history
  • Loading branch information
justsmth authored Nov 20, 2024
1 parent c236deb commit 62885be
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
8 changes: 8 additions & 0 deletions aws-lc-sys/builder/cc_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,14 @@ impl CcBuilder {
env::set_var("CFLAGS", cflags);
}

if target_os() == "macos" && target_arch() == "x86_64" {
// This compiler error has only been seen on MacOS x86_64:
// ```
// clang: error: overriding '-mmacosx-version-min=13.7' option with '--target=x86_64-apple-macosx14.2' [-Werror,-Woverriding-t-option]
// ```
cc_build.flag_if_supported("-Wno-overriding-t-option");
}

cc_build
}

Expand Down
1 change: 0 additions & 1 deletion aws-lc-sys/builder/cmake_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ impl CmakeBuilder {
// If the build environment vendor is Apple
#[cfg(target_vendor = "apple")]
{
cmake_cfg.cflag("-Wno-overriding-t-option");
if target_arch() == "aarch64" {
cmake_cfg.define("CMAKE_OSX_ARCHITECTURES", "arm64");
cmake_cfg.define("CMAKE_SYSTEM_PROCESSOR", "arm64");
Expand Down

0 comments on commit 62885be

Please sign in to comment.