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

Remove FreeBSD version from SDK triple

Browse Source
This commit is contained in:
Michael Chiu
2025-02-01 12:05:39 -08:00
parent cbbfd17464
commit c6d9efa553
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/SwiftConfigureSDK.cmake
View File

@@ -427,7 +427,7 @@ macro(configure_sdk_unix name architectures)
string(REGEX REPLACE "[-].*" "" freebsd_system_version ${CMAKE_SYSTEM_VERSION}) string(REGEX REPLACE "[-].*" "" freebsd_system_version ${CMAKE_SYSTEM_VERSION})
message(STATUS "FreeBSD Version: ${freebsd_system_version}") message(STATUS "FreeBSD Version: ${freebsd_system_version}")
set(SWIFT_SDK_FREEBSD_ARCH_${arch}_TRIPLE "${arch}-unknown-freebsd${freebsd_system_version}") set(SWIFT_SDK_FREEBSD_ARCH_${arch}_TRIPLE "${arch}-unknown-freebsd")
elseif("${prefix}" STREQUAL "OPENBSD") elseif("${prefix}" STREQUAL "OPENBSD")
if(NOT arch STREQUAL "x86_64" AND NOT arch STREQUAL "aarch64") if(NOT arch STREQUAL "x86_64" AND NOT arch STREQUAL "aarch64")
message(FATAL_ERROR "unsupported arch for OpenBSD: ${arch}") message(FATAL_ERROR "unsupported arch for OpenBSD: ${arch}")

4
lib/Basic/Platform.cpp
View File

@@ -414,6 +414,10 @@ llvm::Triple swift::getTargetSpecificModuleTriple(const llvm::Triple &triple) {
triple.getOSName(), environment); triple.getOSName(), environment);
} }
if (triple.isOSFreeBSD()) {
return swift::getUnversionedTriple(triple);
}
// Other platforms get no normalization. // Other platforms get no normalization.
return triple; return triple;
} }