Skip to content

[CMake][lldb] change the runpath to an architecture-specific directory on ELF platforms #6383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[CMake][lldb] change the runpath to an architecture-specific directory on ELF platforms #6383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lldb/cmake/modules/AddLLDB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ function(add_properties_for_swift_modules target reldir)
elseif (CMAKE_SYSTEM_NAME MATCHES "Linux")
string(REGEX MATCH "^[^-]*" arch ${LLVM_TARGET_TRIPLE})
target_link_libraries(${target} PRIVATE swiftCore-linux-${arch})
set(SWIFT_RPATH "${LLDB_SWIFT_LIBS}/linux;$ORIGIN/../lib/swift/linux")
set(SWIFT_RPATH "${LLDB_SWIFT_LIBS}/linux/${arch};$ORIGIN/../lib/swift/linux/${arch}")
endif()

set_property(TARGET ${target} APPEND PROPERTY BUILD_RPATH "${SWIFT_RPATH}")
Expand Down
4 changes: 2 additions & 2 deletions lldb/tools/repl/swift/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL Linux)
BUILD_RPATH ${SWIFT_LIBRARY_DIR}/swift/linux/powerpc64le)
else()
set_target_properties(repl_swift PROPERTIES
BUILD_RPATH ${SWIFT_LIBRARY_DIR}/swift/linux)
BUILD_RPATH ${SWIFT_LIBRARY_DIR}/swift/linux/${CMAKE_SYSTEM_PROCESSOR})
endif()
set_target_properties(repl_swift PROPERTIES
BUILD_WITH_INSTALL_RPATH NO
INSTALL_RPATH "$ORIGIN/../lib/swift/linux")
INSTALL_RPATH "$ORIGIN/../lib/swift/linux/${CMAKE_SYSTEM_PROCESSOR}")
endif()

# The dummy repl executable is a C program, but we always look for a mangled
Expand Down