averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix the ARM architecture on FreeBSD

Browse Source 
The 64-bit ARM architecture spelling on FreeBSD is aarch64, not arm64.
This results in a build failure about a missing
`freebsd/arm64/swiftrt.o` while building the runtimes.
This commit is contained in:
Evan Wilde
2025-05-20 18:46:58 -07:00
parent 9993d295fa
commit fd2ba8b95d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/SwiftConfigureSDK.cmake
View File

@@ -417,7 +417,7 @@ macro(configure_sdk_unix name architectures)
message(FATAL_ERROR "unknown arch for ${prefix}: ${arch}") message(FATAL_ERROR "unknown arch for ${prefix}: ${arch}")
endif() endif()
elseif("${prefix}" STREQUAL "FREEBSD") elseif("${prefix}" STREQUAL "FREEBSD")
if(NOT arch MATCHES "(arm64|x86_64)") if(NOT arch MATCHES "(aarch64|x86_64)")
message(FATAL_ERROR "unsupported arch for FreeBSD: ${arch}") message(FATAL_ERROR "unsupported arch for FreeBSD: ${arch}")
endif() endif()

2
utils/build-script-impl
View File

@@ -461,7 +461,7 @@ function should_execute_host_actions_for_phase() {
function verify_host_is_supported() { function verify_host_is_supported() {
local host="$1" local host="$1"
case ${host} in case ${host} in
freebsd-arm64 \ freebsd-aarch64 \
| freebsd-x86_64 \ | freebsd-x86_64 \
| openbsd-x86_64 \ | openbsd-x86_64 \
| openbsd-aarch64 \ | openbsd-aarch64 \

4
utils/swift_build_support/swift_build_support/targets.py
View File

@@ -290,7 +290,7 @@ class StdlibDeploymentTarget(object):
"riscv64", "riscv64",
"s390x"]) "s390x"])
FreeBSD = Platform("freebsd", archs=["x86_64", "arm64"]) FreeBSD = Platform("freebsd", archs=["x86_64", "aarch64"])
LinuxStatic = Platform('linux-static', sdk_name='LINUX_STATIC', archs=[ LinuxStatic = Platform('linux-static', sdk_name='LINUX_STATIC', archs=[
'x86_64', 'x86_64',
@@ -399,7 +399,7 @@ class StdlibDeploymentTarget(object):
if machine == 'amd64': if machine == 'amd64':
return StdlibDeploymentTarget.FreeBSD.x86_64 return StdlibDeploymentTarget.FreeBSD.x86_64
elif machine == 'arm64': elif machine == 'arm64':
return StdlibDeploymentTarget.FreeBSD.arm64 return StdlibDeploymentTarget.FreeBSD.aarch64
elif system == 'OpenBSD': elif system == 'OpenBSD':
if machine == 'amd64': if machine == 'amd64':