Skip to content

Add platform-specific configurations for iOS and macOS ARM64 to prevent AVX code compilation on x64 macOS #6731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Add platform-specific configurations for iOS and macOS ARM64 to prevent AVX code compilation on x64 macOS #6731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cccae4a
Add platform-specific configurations for iOS and macOS ARM64 to preve…
AkiSakurai Nov 8, 2024
4c1d38f
build: Add macOS x86_64 target support for ARM hosts
AkiSakurai Nov 15, 2024
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
15 changes: 15 additions & 0 deletions build/Utils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,21 @@ function(extract_sources sources_file)
message(FATAL_ERROR "Unsupported ANDROID_ABI setting ${ANDROID_ABI}. Please add it here!")
endif()
endif()

if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
set(target_platforms_arg "--target-platforms=shim//:ios-arm64")
endif()
endif()

if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
set(target_platforms_arg "--target-platforms=shim//:macos-arm64")
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
set(target_platforms_arg "--target-platforms=shim//:macos-x86_64")
endif()
endif()

execute_process(
COMMAND
${PYTHON_EXECUTABLE} ${executorch_root}/build/extract_sources.py
Expand Down
24 changes: 24 additions & 0 deletions shim/BUCK
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,27 @@ execution_platform(
use_windows_path_separators = host_info().os.is_windows,
visibility = ["PUBLIC"],
)

execution_platform(
name = "ios-arm64",
cpu_configuration = "prelude//cpu:arm64",
os_configuration = "prelude//os:ios",
use_windows_path_separators = False,
visibility = ["PUBLIC"],
)

execution_platform(
name = "macos-arm64",
cpu_configuration = "prelude//cpu:arm64",
os_configuration = "prelude//os:macos",
use_windows_path_separators = False,
visibility = ["PUBLIC"],
)

execution_platform(
name = "macos-x86_64",
cpu_configuration = "prelude//cpu:x86_64",
os_configuration = "prelude//os:macos",
use_windows_path_separators = False,
visibility = ["PUBLIC"],
)
Loading