@@ -172,25 +172,29 @@ function(add_properties_for_swift_modules target reldir)
172
172
target_link_directories (${target} PRIVATE
173
173
"${CMAKE_OSX_SYSROOT} /usr/lib/swift"
174
174
"${LLDB_SWIFT_LIBS} /macosx" )
175
- set (SWIFT_RPATH "/usr/lib/swift" )
175
+ set (SWIFT_BUILD_RPATH "/usr/lib/swift" )
176
+ set (SWIFT_INSTALL_RPATH "/usr/lib/swift" )
176
177
elseif (APSM_BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING" )
177
178
target_link_directories (${target} PRIVATE "${LLDB_SWIFT_LIBS} /macosx" )
178
- set (SWIFT_RPATH "${LLDB_SWIFT_LIBS} /macosx" )
179
+ set (SWIFT_BUILD_RPATH "${LLDB_SWIFT_LIBS} /macosx" )
180
+ set (SWIFT_INSTALL_RPATH "${LLDB_SWIFT_LIBS} /macosx" )
179
181
else ()
180
182
message (FATAL_ERROR "Unknown APSM_BOOTSTRAPPING_MODE '${APSM_BOOTSTRAPPING_MODE} '" )
181
183
endif ()
182
184
183
185
# Workaround for a linker crash related to autolinking: rdar://77839981
184
186
set_property (TARGET ${target} APPEND_STRING PROPERTY
185
187
LINK_FLAGS " -lobjc " )
186
- elseif (CMAKE_SYSTEM_NAME MATCHES "Linux" )
188
+ elseif (CMAKE_SYSTEM_NAME MATCHES "Linux|Android|OpenBSD|FreeBSD " )
187
189
string (REGEX MATCH "^[^-]*" arch ${LLVM_TARGET_TRIPLE} )
188
190
target_link_libraries (${target} PRIVATE swiftCore-linux-${arch} )
189
- set (SWIFT_RPATH "${LLDB_SWIFT_LIBS} /linux;$ORIGIN/../lib/swift/linux" )
191
+ string (TOLOWER ${CMAKE_SYSTEM_NAME} platform)
192
+ set (SWIFT_BUILD_RPATH "${LLDB_SWIFT_LIBS} /${platform} " )
193
+ set (SWIFT_INSTALL_RPATH "$ORIGIN/swift/${platform} " )
190
194
endif ()
191
195
192
- set_property (TARGET ${target} APPEND PROPERTY BUILD_RPATH "${SWIFT_RPATH } " )
193
- set_property (TARGET ${target} APPEND PROPERTY INSTALL_RPATH "${SWIFT_RPATH } " )
196
+ set_property (TARGET ${target} APPEND PROPERTY BUILD_RPATH "${SWIFT_BUILD_RPATH } " )
197
+ set_property (TARGET ${target} APPEND PROPERTY INSTALL_RPATH "${SWIFT_INSTALL_RPATH } " )
194
198
195
199
if (SWIFT_SWIFT_PARSER)
196
200
set_property (TARGET ${target}
0 commit comments