@@ -115,12 +115,6 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)
115
115
LINK_FLAGS " -lobjc " )
116
116
117
117
endif () # HAS_SWIFT_MODULES AND ASKD_BOOTSTRAPPING_MODE
118
-
119
- if (SWIFT_SWIFT_PARSER )
120
- # Add rpath to the host Swift libraries.
121
- file (RELATIVE_PATH relative_hostlib_path "${path} " "${SWIFTLIB_DIR} /host" )
122
- list (APPEND RPATH_LIST "@loader_path/${relative_hostlib_path} " )
123
- endif ()
124
118
elseif (SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD" AND HAS_SWIFT_MODULES AND ASKD_BOOTSTRAPPING_MODE )
125
119
set (swiftrt "swiftImageRegistrationObject${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK} _OBJECT_FORMAT}-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK} _LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH} " )
126
120
if (ASKD_BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|CROSSCOMPILE" )
@@ -156,15 +150,19 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)
156
150
else ()
157
151
message (FATAL_ERROR "Unknown ASKD_BOOTSTRAPPING_MODE '${ASKD_BOOTSTRAPPING_MODE} '" )
158
152
endif ()
153
+ endif ()
159
154
160
- if (SWIFT_SWIFT_PARSER )
155
+ if (SWIFT_SWIFT_PARSER )
156
+ if (SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS )
157
+ # Add rpath to the host Swift libraries.
158
+ file (RELATIVE_PATH relative_hostlib_path "${path} " "${SWIFTLIB_DIR} /host" )
159
+ list (APPEND RPATH_LIST "@loader_path/${relative_hostlib_path} " )
160
+ elseif (SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD" )
161
161
# Add rpath to the host Swift libraries.
162
162
file (RELATIVE_PATH relative_hostlib_path "${path} " "${SWIFTLIB_DIR} /host" )
163
163
list (APPEND RPATH_LIST "$ORIGIN/${relative_hostlib_path} " )
164
164
endif ()
165
- endif ()
166
165
167
- if (SWIFT_SWIFT_PARSER )
168
166
# For the "end step" of bootstrapping configurations on Darwin, need to be
169
167
# able to fall back to the SDK directory for libswiftCore et al.
170
168
if (BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*" )
@@ -436,7 +434,6 @@ macro(add_sourcekit_framework name)
436
434
file (RELATIVE_PATH relative_lib_path
437
435
"${framework_location} /Versions/A" "${SOURCEKIT_LIBRARY_OUTPUT_INTDIR} " )
438
436
list (APPEND RPATH_LIST "@loader_path/${relative_lib_path} " )
439
- list (APPEND RPATH_LIST "@loader_path/${relative_lib_path} /swift/host" )
440
437
441
438
set_target_properties (${name} PROPERTIES
442
439
BUILD_WITH_INSTALL_RPATH TRUE
@@ -472,7 +469,6 @@ macro(add_sourcekit_framework name)
472
469
file (RELATIVE_PATH relative_lib_path
473
470
"${framework_location} " "${SOURCEKIT_LIBRARY_OUTPUT_INTDIR} " )
474
471
list (APPEND RPATH_LIST "@loader_path/${relative_lib_path} " )
475
- list (APPEND RPATH_LIST "@loader_path/${relative_lib_path} /swift/host" )
476
472
477
473
set_target_properties (${name} PROPERTIES
478
474
BUILD_WITH_INSTALL_RPATH TRUE
@@ -564,7 +560,6 @@ macro(add_sourcekit_xpc_service name framework_target)
564
560
565
561
file (RELATIVE_PATH relative_lib_path "${xpc_bin_dir} " "${lib_dir} " )
566
562
list (APPEND RPATH_LIST "@loader_path/${relative_lib_path} " )
567
- list (APPEND RPATH_LIST "@loader_path/${relative_lib_path} /swift/host" )
568
563
569
564
# Add rpath for sourcekitdInProc
570
565
# lib/${framework_target}.framework/Versions/A/XPCServices/${name}.xpc/Contents/MacOS/${name}
0 commit comments