From 9d78971b9beae34bd5567ab1685ac785e6689f1f Mon Sep 17 00:00:00 2001 From: Rintaro Ishizaki Date: Wed, 30 Aug 2023 11:56:00 -0700 Subject: [PATCH] [CMake][SourceKit] Add RPATH to 'lib/swift/host' RPATH to 'lib/swift/host' was missing in Darwin platform. --- tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake index 563df1a114d58..7e2e1bc16e763 100644 --- a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake +++ b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake @@ -116,6 +116,11 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES) endif() # HAS_SWIFT_MODULES AND ASKD_BOOTSTRAPPING_MODE + if(SWIFT_SWIFT_PARSER) + # Add rpath to the host Swift libraries. + file(RELATIVE_PATH relative_hostlib_path "${path}" "${SWIFTLIB_DIR}/host") + list(APPEND RPATH_LIST "@loader_path/${relative_hostlib_path}") + endif() elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD" AND HAS_SWIFT_MODULES AND ASKD_BOOTSTRAPPING_MODE) set(swiftrt "swiftImageRegistrationObject${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_OBJECT_FORMAT}-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH}") if(ASKD_BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|CROSSCOMPILE")