Skip to content

Commit 2eca270

Browse files
committed
[lldb] Update for _CompilerSwiftSyntax libraries
swift-syntax libraries for compilers are now in 'lib/swift/host/compiler' (cherry picked from commit 6f572b8)
1 parent 09fac7b commit 2eca270

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lldb/cmake/modules/AddLLDB.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,19 +240,19 @@ function(add_properties_for_swift_modules target reldir)
240240
if (SWIFT_BUILD_SWIFT_SYNTAX)
241241
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
242242
set_property(TARGET ${target}
243-
APPEND PROPERTY BUILD_RPATH "@loader_path/${build_reldir}lib/swift/host")
243+
APPEND PROPERTY BUILD_RPATH "@loader_path/${build_reldir}lib/swift/host/compiler")
244244
set_property(TARGET ${target}
245-
APPEND PROPERTY INSTALL_RPATH "@loader_path/${reldir}lib/swift/host")
245+
APPEND PROPERTY INSTALL_RPATH "@loader_path/${reldir}lib/swift/host/compiler")
246246
if(SWIFT_ALLOW_LINKING_SWIFT_CONTENT_IN_DARWIN_TOOLCHAIN)
247247
get_filename_component(TOOLCHAIN_BIN_DIR ${CMAKE_Swift_COMPILER} DIRECTORY)
248248
get_filename_component(TOOLCHAIN_LIB_DIR "${TOOLCHAIN_BIN_DIR}/../lib/swift/macosx" ABSOLUTE)
249249
target_link_directories(${target} BEFORE PUBLIC ${TOOLCHAIN_LIB_DIR})
250250
endif()
251251
elseif (CMAKE_SYSTEM_NAME MATCHES "Linux|Android|OpenBSD|FreeBSD")
252252
set_property(TARGET ${target}
253-
APPEND PROPERTY BUILD_RPATH "$ORIGIN/${build_reldir}lib/swift/host")
253+
APPEND PROPERTY BUILD_RPATH "$ORIGIN/${build_reldir}lib/swift/host/compiler")
254254
set_property(TARGET ${target}
255-
APPEND PROPERTY INSTALL_RPATH "$ORIGIN/${reldir}lib/swift/host")
255+
APPEND PROPERTY INSTALL_RPATH "$ORIGIN/${reldir}lib/swift/host/compiler")
256256
endif()
257257
endif()
258258
endif()

0 commit comments

Comments
 (0)