Skip to content

[lldb] Update for _CompilerSwiftSyntax libraries #8855

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

Merged
merged 1 commit into from
Jun 26, 2024
+4 −4
Merged

[lldb] Update for _CompilerSwiftSyntax libraries #8855

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
8 changes: 4 additions & 4 deletions lldb/cmake/modules/AddLLDB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,19 +241,19 @@ function(add_properties_for_swift_modules target reldir)
if (SWIFT_BUILD_SWIFT_SYNTAX)
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
set_property(TARGET ${target}
APPEND PROPERTY BUILD_RPATH "@loader_path/${build_reldir}lib/swift/host")
APPEND PROPERTY BUILD_RPATH "@loader_path/${build_reldir}lib/swift/host/compiler")
set_property(TARGET ${target}
APPEND PROPERTY INSTALL_RPATH "@loader_path/${reldir}lib/swift/host")
APPEND PROPERTY INSTALL_RPATH "@loader_path/${reldir}lib/swift/host/compiler")
Comment on lines -244 to +246
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we also need to update the Linux/etc branch?

if(SWIFT_ALLOW_LINKING_SWIFT_CONTENT_IN_DARWIN_TOOLCHAIN)
get_filename_component(TOOLCHAIN_BIN_DIR ${CMAKE_Swift_COMPILER} DIRECTORY)
get_filename_component(TOOLCHAIN_LIB_DIR "${TOOLCHAIN_BIN_DIR}/../lib/swift/macosx" ABSOLUTE)
target_link_directories(${target} BEFORE PUBLIC ${TOOLCHAIN_LIB_DIR})
endif()
elseif (CMAKE_SYSTEM_NAME MATCHES "Linux|Android|OpenBSD|FreeBSD")
set_property(TARGET ${target}
APPEND PROPERTY BUILD_RPATH "$ORIGIN/${build_reldir}lib/swift/host")
APPEND PROPERTY BUILD_RPATH "$ORIGIN/${build_reldir}lib/swift/host/compiler")
set_property(TARGET ${target}
APPEND PROPERTY INSTALL_RPATH "$ORIGIN/${reldir}lib/swift/host")
APPEND PROPERTY INSTALL_RPATH "$ORIGIN/${reldir}lib/swift/host/compiler")
endif()
endif()
endif()
Expand Down