Skip to content

Fix the ARM architecture on FreeBSD #81662

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix the ARM architecture on FreeBSD #81662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmake/modules/SwiftConfigureSDK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ macro(configure_sdk_unix name architectures)
message(FATAL_ERROR "unknown arch for ${prefix}: ${arch}")
endif()
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}")
endif()

Expand Down
2 changes: 1 addition & 1 deletion utils/build-script-impl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ function should_execute_host_actions_for_phase() {
function verify_host_is_supported() {
local host="$1"
case ${host} in
freebsd-arm64 \
freebsd-aarch64 \
| freebsd-x86_64 \
| openbsd-x86_64 \
| openbsd-aarch64 \
Expand Down
4 changes: 2 additions & 2 deletions utils/swift_build_support/swift_build_support/targets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ class StdlibDeploymentTarget(object):
"riscv64",
"s390x"])

FreeBSD = Platform("freebsd", archs=["x86_64", "arm64"])
FreeBSD = Platform("freebsd", archs=["x86_64", "aarch64"])

LinuxStatic = Platform('linux-static', sdk_name='LINUX_STATIC', archs=[
'x86_64',
Expand Down Expand Up @@ -399,7 +399,7 @@ def host_target():
if machine == 'amd64':
return StdlibDeploymentTarget.FreeBSD.x86_64
elif machine == 'arm64':
return StdlibDeploymentTarget.FreeBSD.arm64
return StdlibDeploymentTarget.FreeBSD.aarch64

elif system == 'OpenBSD':
if machine == 'amd64':
Expand Down