File tree Expand file tree Collapse file tree 5 files changed +7
-14
lines changed Expand file tree Collapse file tree 5 files changed +7
-14
lines changed Original file line number Diff line number Diff line change @@ -212,6 +212,12 @@ else()
212212 "/clang:-fcf-runtime-abi=swift" )
213213endif ()
214214
215+ set (CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH ON )
216+ set (CMAKE_INSTALL_RPATH "$ORIGIN" )
217+ if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD|DragonFlyBSD" )
218+ add_link_options ("LINKER:-z,origin" )
219+ endif ()
220+
215221if (CMAKE_BUILD_TYPE STREQUAL Debug)
216222 list (APPEND _Foundation_common_build_flags
217223 "-DDEBUG" )
Original file line number Diff line number Diff line change @@ -164,10 +164,6 @@ if(NOT BUILD_SHARED_LIBS)
164164 "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend swiftSynchronization>" )
165165endif ()
166166
167- set_target_properties (Foundation PROPERTIES
168- INSTALL_RPATH "$ORIGIN"
169- INSTALL_REMOVE_ENVIRONMENT_RPATH ON )
170-
171167if (dispatch_FOUND)
172168 set_target_properties (Foundation PROPERTIES
173169 BUILD_RPATH "$<TARGET_FILE_DIR:swiftDispatch>" )
Original file line number Diff line number Diff line change @@ -73,10 +73,6 @@ if(NOT BUILD_SHARED_LIBS)
7373
7474endif ()
7575
76- set_target_properties (FoundationNetworking PROPERTIES
77- INSTALL_RPATH "$ORIGIN"
78- INSTALL_REMOVE_ENVIRONMENT_RPATH ON )
79-
8076if (LINKER_SUPPORTS_BUILD_ID)
8177 target_link_options (FoundationNetworking PRIVATE "LINKER:--build-id=sha1" )
8278endif ()
Original file line number Diff line number Diff line change @@ -46,10 +46,6 @@ if(NOT BUILD_SHARED_LIBS)
4646
4747endif ()
4848
49- set_target_properties (FoundationXML PROPERTIES
50- INSTALL_RPATH "$ORIGIN"
51- INSTALL_REMOVE_ENVIRONMENT_RPATH ON )
52-
5349if (LINKER_SUPPORTS_BUILD_ID)
5450 target_link_options (FoundationXML PRIVATE "LINKER:--build-id=sha1" )
5551endif ()
Original file line number Diff line number Diff line change @@ -23,8 +23,7 @@ target_link_libraries(plutil PRIVATE
2323 Foundation)
2424
2525set_target_properties (plutil PROPERTIES
26- INSTALL_RPATH "$ORIGIN/../lib/swift/${SWIFT_SYSTEM_NAME} "
27- INSTALL_REMOVE_ENVIRONMENT_RPATH ON )
26+ INSTALL_RPATH "$ORIGIN/../lib/swift/${SWIFT_SYSTEM_NAME} " )
2827
2928set_property (GLOBAL APPEND PROPERTY Foundation_EXPORTS plutil)
3029install (TARGETS plutil
You can’t perform that action at this time.
0 commit comments