From f9c2fa20f08004c64dcb487f725cb201d40d35e8 Mon Sep 17 00:00:00 2001 From: Karina Date: Mon, 20 Apr 2026 11:49:12 +0400 Subject: [PATCH] fix: swift toolchain path on linux --- Kernel/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index 4134daa..35e5e17 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -25,14 +25,18 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") endif() endforeach() else() - # Linux: find swiftc in PATH, derive resource dir from its location + # Linux: find swiftc in PATH find_program(_SWIFTC_EXE swiftc) if(_SWIFTC_EXE) get_filename_component(_SWIFTC_BIN "${_SWIFTC_EXE}" DIRECTORY) get_filename_component(_SWIFTC_USR "${_SWIFTC_BIN}" DIRECTORY) + if(EXISTS "${_SWIFTC_USR}/lib/swift/embedded") set(SWIFTC "${_SWIFTC_EXE}") set(SWIFT_RESOURCE_DIR "${_SWIFTC_USR}/lib/swift") + elseif(EXISTS "${_SWIFTC_USR}/lib/swift/lib/swift/embedded") + set(SWIFTC "${_SWIFTC_EXE}") + set(SWIFT_RESOURCE_DIR "${_SWIFTC_USR}/lib/swift/lib/swift") endif() endif() endif()