mirror of
https://codeberg.org/guix/guix.git
synced 2026-01-25 03:55:08 -06:00
335c424a3d
* 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
15 lines
680 B
Diff
15 lines
680 B
Diff
Author: Danny Milosavljevic <dannym@friendly-machines.com>
|
|
Date: 2025-10-20
|
|
Subject: Fix rpath for lib/swift/linux
|
|
|
|
--- a/stdlib/cmake/modules/AddSwiftStdlib.cmake
|
|
+++ b/stdlib/cmake/modules/AddSwiftStdlib.cmake
|
|
@@ -1230,7 +1230,7 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
|
|
list(APPEND library_search_directories "$ENV{SDKROOT}/usr/lib/swift")
|
|
endif()
|
|
|
|
- list(APPEND library_search_directories "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}/usr/lib/swift")
|
|
+ list(APPEND library_search_directories "${CMAKE_INSTALL_PREFIX}/lib/swift/linux")
|
|
|
|
if(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE")
|
|
list(APPEND library_search_directories
|