Skip to content

Commit 2aaa14c

Browse files
committed
[lldb][cmake] Remove local rpaths from the build host on ELF platforms
Also, add rpath support for more platforms, like Android and the BSDs.
1 parent 31aebff commit 2aaa14c

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

lldb/cmake/modules/AddLLDB.cmake

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,25 +172,29 @@ function(add_properties_for_swift_modules target reldir)
172172
target_link_directories(${target} PRIVATE
173173
"${CMAKE_OSX_SYSROOT}/usr/lib/swift"
174174
"${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")
176177
elseif(APSM_BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING")
177178
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")
179181
else()
180182
message(FATAL_ERROR "Unknown APSM_BOOTSTRAPPING_MODE '${APSM_BOOTSTRAPPING_MODE}'")
181183
endif()
182184

183185
# Workaround for a linker crash related to autolinking: rdar://77839981
184186
set_property(TARGET ${target} APPEND_STRING PROPERTY
185187
LINK_FLAGS " -lobjc ")
186-
elseif (CMAKE_SYSTEM_NAME MATCHES "Linux")
188+
elseif (CMAKE_SYSTEM_NAME MATCHES "Linux|Android|OpenBSD|FreeBSD")
187189
string(REGEX MATCH "^[^-]*" arch ${LLVM_TARGET_TRIPLE})
188190
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}")
190194
endif()
191195

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}")
194198

195199
if (SWIFT_SWIFT_PARSER)
196200
set_property(TARGET ${target}

0 commit comments

Comments
 (0)