Skip to content

build-script-impl: add support for freebsd-arm64 #66655

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

Merged
merged 2 commits into from
Jun 15, 2023
Merged

build-script-impl: add support for freebsd-arm64 #66655

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
c435405
build-script-impl: add support for `freebsd-arm64`
MaxDesiatov Jun 15, 2023
8499aa0
SwiftConfigureSDK.cmake: support `freebsd-arm64`
MaxDesiatov Jun 15, 2023
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
4 changes: 2 additions & 2 deletions cmake/modules/SwiftConfigureSDK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ macro(configure_sdk_unix name architectures)
message(FATAL_ERROR "unknown arch for ${prefix}: ${arch}")
endif()
elseif("${prefix}" STREQUAL "FREEBSD")
if(NOT arch STREQUAL x86_64)
if(NOT arch MATCHES "(arm64|x86_64)")
message(FATAL_ERROR "unsupported arch for FreeBSD: ${arch}")
endif()

Expand All @@ -389,7 +389,7 @@ macro(configure_sdk_unix name architectures)
string(REGEX REPLACE "[-].*" "" freebsd_system_version ${CMAKE_SYSTEM_VERSION})
message(STATUS "FreeBSD Version: ${freebsd_system_version}")

set(SWIFT_SDK_FREEBSD_ARCH_x86_64_TRIPLE "x86_64-unknown-freebsd${freebsd_system_version}")
set(SWIFT_SDK_FREEBSD_ARCH_${arch}_TRIPLE "${arch}-unknown-freebsd${freebsd_system_version}")
elseif("${prefix}" STREQUAL "OPENBSD")
if(NOT arch STREQUAL amd64)
message(FATAL_ERROR "unsupported arch for OpenBSD: ${arch}")
Expand Down
3 changes: 2 additions & 1 deletion utils/build-script-impl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,8 @@ function should_execute_host_actions_for_phase() {
function verify_host_is_supported() {
local host="$1"
case ${host} in
freebsd-x86_64 \
freebsd-arm64 \
| freebsd-x86_64 \
| openbsd-amd64 \
| cygwin-x86_64 \
| haiku-x86_64 \
Expand Down