646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
37 lines
1.7 KiB
Diff
37 lines
1.7 KiB
Diff
Disable rpath for the bootstrap build with CMake.
|
|
|
|
--- a/Sources/PackageDescription/CMakeLists.txt
|
|
+++ b/Sources/PackageDescription/CMakeLists.txt
|
|
@@ -31,14 +31,11 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin)
|
|
set(SWIFT_INTERFACE_PATH ${CMAKE_BINARY_DIR}/pm/ManifestAPI/PackageDescription.swiftinterface)
|
|
target_compile_options(PackageDescription PUBLIC
|
|
$<$<COMPILE_LANGUAGE:Swift>:-emit-module-interface-path$<SEMICOLON>${SWIFT_INTERFACE_PATH}>)
|
|
- target_link_options(PackageDescription PRIVATE
|
|
- "SHELL:-Xlinker -install_name -Xlinker @rpath/libPackageDescription.dylib")
|
|
endif()
|
|
|
|
set_target_properties(PackageDescription PROPERTIES
|
|
Swift_MODULE_NAME PackageDescription
|
|
Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI
|
|
- INSTALL_NAME_DIR \\@rpath
|
|
OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI
|
|
OUTPUT_NAME PackageDescription
|
|
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI
|
|
--- a/Sources/PackagePlugin/CMakeLists.txt
|
|
+++ b/Sources/PackagePlugin/CMakeLists.txt
|
|
@@ -29,14 +29,11 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin)
|
|
set(SWIFT_INTERFACE_PATH ${CMAKE_BINARY_DIR}/pm/PluginAPI/PackagePlugin.swiftinterface)
|
|
target_compile_options(PackagePlugin PUBLIC
|
|
$<$<COMPILE_LANGUAGE:Swift>:-emit-module-interface-path$<SEMICOLON>${SWIFT_INTERFACE_PATH}>)
|
|
- target_link_options(PackagePlugin PRIVATE
|
|
- "SHELL:-Xlinker -install_name -Xlinker @rpath/libPackagePlugin.dylib")
|
|
endif()
|
|
|
|
set_target_properties(PackagePlugin PROPERTIES
|
|
Swift_MODULE_NAME PackagePlugin
|
|
Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI
|
|
- INSTALL_NAME_DIR \\@rpath
|
|
OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI
|
|
OUTPUT_NAME PackagePlugin
|
|
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI
|