From e5c5b646e6b8d42ebee28ea2fba2116b29356042 Mon Sep 17 00:00:00 2001 From: Rintaro Ishizaki Date: Wed, 5 Jun 2024 21:59:40 +0000 Subject: [PATCH] [lldb] Update for _CompilerSwiftSyntax libraries swift-syntax libraries for compilers are now in 'lib/swift/host/compiler' (cherry picked from commit 6f572b83ad2cfd87f6f34d2fb0c66f07fe7e1ee0) --- lldb/cmake/modules/AddLLDB.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake index 33849b8106f21..cc5a9c418f7e0 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake @@ -241,9 +241,9 @@ 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") 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) @@ -251,9 +251,9 @@ function(add_properties_for_swift_modules target reldir) 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()