Luke Granger-Brown
57725ef3ec
git-subtree-dir: third_party/nixpkgs git-subtree-split: 76612b17c0ce71689921ca12d9ffdc9c23ce40b2
36 lines
1.7 KiB
Diff
36 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
|