Skip to content

Commit d0a7cea

Browse files
authored
Merge pull request #61816 from mhjacobson/freebsd-strip-version-suffix
build: add missing `REGEX` to properly strip {Free,Open}BSD version suffixes
2 parents 40547a1 + 457af85 commit d0a7cea

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmake/modules/SwiftConfigureSDK.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ macro(configure_sdk_unix name architectures)
378378
message(WARNING "CMAKE_SYSTEM_VERSION will not match target")
379379
endif()
380380

381-
string(REPLACE "[-].*" "" freebsd_system_version ${CMAKE_SYSTEM_VERSION})
381+
string(REGEX REPLACE "[-].*" "" freebsd_system_version ${CMAKE_SYSTEM_VERSION})
382382
message(STATUS "FreeBSD Version: ${freebsd_system_version}")
383383

384384
set(SWIFT_SDK_FREEBSD_ARCH_x86_64_TRIPLE "x86_64-unknown-freebsd${freebsd_system_version}")
@@ -387,7 +387,7 @@ macro(configure_sdk_unix name architectures)
387387
message(FATAL_ERROR "unsupported arch for OpenBSD: ${arch}")
388388
endif()
389389

390-
string(REPLACE "[-].*" "" openbsd_system_version ${CMAKE_SYSTEM_VERSION})
390+
set(openbsd_system_version ${CMAKE_SYSTEM_VERSION})
391391
message(STATUS "OpenBSD Version: ${openbsd_system_version}")
392392

393393
set(SWIFT_SDK_OPENBSD_ARCH_amd64_TRIPLE "amd64-unknown-openbsd${openbsd_system_version}")

0 commit comments

Comments
 (0)