File tree 4 files changed +5
-5
lines changed 4 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -954,7 +954,7 @@ if(SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR)
954
954
set (SWIFT_SWIFT_PARSER TRUE )
955
955
include (${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_TARGETS} )
956
956
957
- if (SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX" AND NOT BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS" )
957
+ if (SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD " AND NOT BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS" )
958
958
# Only "HOSTTOOLS" is supported in Linux when Swift parser integration is enabled.
959
959
message (WARNING "Force setting BOOTSTRAPPING=HOSTTOOLS because Swift parser integration is enabled" )
960
960
set (BOOTSTRAPPING_MODE "HOSTTOOLS" )
Original file line number Diff line number Diff line change @@ -66,7 +66,7 @@ function(_add_host_swift_compile_options name)
66
66
endfunction ()
67
67
68
68
function (_set_pure_swift_link_flags name relpath_to_lib_dir)
69
- if (SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX" )
69
+ if (SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD " )
70
70
# Don't add builder's stdlib RPATH automatically.
71
71
target_compile_options (${name} PRIVATE
72
72
$<$<COMPILE_LANGUAGE:Swift>:-no -toolchain-stdlib-rpath>
@@ -291,7 +291,7 @@ function(add_pure_swift_host_tool name)
291
291
set_property (TARGET ${name}
292
292
APPEND PROPERTY INSTALL_RPATH
293
293
"@executable_path/../lib/swift/host" )
294
- else ( )
294
+ elseif (SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD" )
295
295
set_property (TARGET ${name}
296
296
APPEND PROPERTY INSTALL_RPATH
297
297
"$ORIGIN/../lib/swift/host" )
Original file line number Diff line number Diff line change @@ -54,7 +54,7 @@ if (SWIFT_SWIFT_PARSER)
54
54
# be found via RPATH.
55
55
foreach (sharedlib ${SWIFT_SYNTAX_SHARED_LIBRARIES} )
56
56
set (add_origin_rpath)
57
- if (SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX" )
57
+ if (SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD " )
58
58
# At runtime, use swiftCore in the current toolchain.
59
59
swift_get_set_rpath_script_file(setrpath_command)
60
60
set (add_origin_rpath COMMAND ${CMAKE_COMMAND}
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ function(add_swift_macro_library name)
39
39
_set_pure_swift_link_flags(${name} "${relpath_to_lib} " )
40
40
41
41
# Add rpath to 'lib/host'
42
- if (SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX" )
42
+ if (SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD " )
43
43
set_property (TARGET ${name}
44
44
APPEND PROPERTY INSTALL_RPATH "$ORIGIN/.." )
45
45
endif ()
You can’t perform that action at this time.
0 commit comments