Skip to content

Commit 90eed66

Browse files
committed
FreeBSD: Set sourcekitInProc rpaths
The sourcekit in proc dynamic library looks up runtimes in a spot relative to the Swift compiler. Set this location on freebsd, fixing the sourcekit tests.
1 parent 25585c0 commit 90eed66

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)
103103
LINK_FLAGS " -lobjc ")
104104

105105
endif() # HAS_SWIFT_MODULES AND ASKD_BOOTSTRAPPING_MODE
106-
elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD" AND HAS_SWIFT_MODULES AND ASKD_BOOTSTRAPPING_MODE)
106+
elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|FREEBSD|OPENBSD" AND HAS_SWIFT_MODULES AND ASKD_BOOTSTRAPPING_MODE)
107107
set(swiftrt "swiftImageRegistrationObject${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_OBJECT_FORMAT}-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH}")
108108
if(ASKD_BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|CROSSCOMPILE")
109109
if(ASKD_BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS")
@@ -158,7 +158,7 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)
158158
# Add rpath to the host Swift libraries.
159159
file(RELATIVE_PATH relative_hostlib_path "${path}" "${SWIFTLIB_DIR}/host/compiler")
160160
list(APPEND RPATH_LIST "@loader_path/${relative_hostlib_path}")
161-
elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD")
161+
elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|FREEBSD|OPENBSD")
162162
# Add rpath to the host Swift libraries.
163163
file(RELATIVE_PATH relative_hostlib_path "${path}" "${SWIFTLIB_DIR}/host/compiler")
164164
list(APPEND RPATH_LIST "$ORIGIN/${relative_hostlib_path}")

0 commit comments

Comments
 (0)