diff options
| author | Danny Milosavljevic <dannym@friendly-machines.com> | 2025-10-20 08:25:07 +0000 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@friendly-machines.com> | 2025-11-02 16:13:35 +0100 |
| commit | 335c424a3d4496907c756d3c3f4c5bf35d9580f9 (patch) | |
| tree | e870bcf562defdb87b84ecdca98c345c15af9232 /gnu/packages/patches/swift-5.7.3-sourcekit-rpath.patch | |
| parent | 3aa493477c9d271aeb8a6c75647a9dd00cbfb508 (diff) | |
gnu: Add swift-bootstrap.
* gnu/packages/swift.scm (swift-bootstrap): New variable.
(%swift-bootstrap-source): New variable.
(%swift-libdispatch-source): New variable.
* gnu/local.mk (dist_patch_DATA): Add swift-5.7.3-sdk-path.patch,
swift-5.7.3-sourcekit-rpath.patch,
swift-corelibs-libdispatch-5.6.3-lock-cpp.patch,
swift-corelibs-libdispatch-5.7.3-modulemap.patch.
* gnu/packages/patches/swift-5.7.3-sdk-path.patch: New file.
* gnu/packages/patches/swift-5.7.3-sourcekit-rpath.patch: New file.
* gnu/packages/patches/swift-corelibs-libdispatch-5.6.3-lock-cpp.patch: New file.
* gnu/packages/patches/swift-corelibs-libdispatch-5.7.3-modulemap.patch: New file.
Change-Id: Ibcab88d88be0cc9634f297d17174ca99060e4d98
Diffstat (limited to 'gnu/packages/patches/swift-5.7.3-sourcekit-rpath.patch')
| -rw-r--r-- | gnu/packages/patches/swift-5.7.3-sourcekit-rpath.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/gnu/packages/patches/swift-5.7.3-sourcekit-rpath.patch b/gnu/packages/patches/swift-5.7.3-sourcekit-rpath.patch new file mode 100644 index 00000000000..2f122ceb126 --- /dev/null +++ b/gnu/packages/patches/swift-5.7.3-sourcekit-rpath.patch @@ -0,0 +1,22 @@ +Author: Danny Milosavljevic <dannym@friendly-machines.com> +Date: 2025-10-20 +Subject: Set RPATH for SourceKit + +Set RPATH for SourceKit shared libraries on Linux when BOOTSTRAPPING_MODE is not set. + +Without this, libsourcekitdInProc.so has no RPATH and cannot find libdispatch.so +and libBlocksRuntime.so in lib/swift/linux/. + +--- a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake ++++ b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake +@@ -227,6 +227,10 @@ macro(add_sourcekit_library name) + + if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") + set_target_properties(${name} PROPERTIES INSTALL_NAME_DIR "@rpath") ++ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") ++ if(NOT RPATH_LIST) ++ set(RPATH_LIST "$ORIGIN/swift/linux") ++ endif() + endif() + set_target_properties(${name} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) + set_target_properties(${name} PROPERTIES INSTALL_RPATH "${RPATH_LIST}") |