From c435405e1b3ddc44bb32995539db63c50ea13909 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 15 Jun 2023 01:04:54 +0100 Subject: [PATCH 1/2] build-script-impl: add support for `freebsd-arm64` Lack of this line causes a build error: `Unknown host tools target: freebsd-arm64`. --- utils/build-script-impl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/build-script-impl b/utils/build-script-impl index dafe4aeaff44c..21712a923143b 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -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 \ From 8499aa044c9ccbdb28c9527e41851fda5db420d4 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 15 Jun 2023 01:11:47 +0100 Subject: [PATCH 2/2] SwiftConfigureSDK.cmake: support `freebsd-arm64` --- cmake/modules/SwiftConfigureSDK.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/modules/SwiftConfigureSDK.cmake b/cmake/modules/SwiftConfigureSDK.cmake index d4cb352d658dd..de058961d2909 100644 --- a/cmake/modules/SwiftConfigureSDK.cmake +++ b/cmake/modules/SwiftConfigureSDK.cmake @@ -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() @@ -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}")