File tree Expand file tree Collapse file tree 4 files changed +5
-5
lines changed Expand file tree Collapse file tree 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)
954954 set (SWIFT_SWIFT_PARSER TRUE )
955955 include (${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_TARGETS} )
956956
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" )
958958 # Only "HOSTTOOLS" is supported in Linux when Swift parser integration is enabled.
959959 message (WARNING "Force setting BOOTSTRAPPING=HOSTTOOLS because Swift parser integration is enabled" )
960960 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)
6666endfunction ()
6767
6868function (_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 " )
7070 # Don't add builder's stdlib RPATH automatically.
7171 target_compile_options (${name} PRIVATE
7272 $<$<COMPILE_LANGUAGE:Swift>:-no -toolchain-stdlib-rpath>
@@ -291,7 +291,7 @@ function(add_pure_swift_host_tool name)
291291 set_property (TARGET ${name}
292292 APPEND PROPERTY INSTALL_RPATH
293293 "@executable_path/../lib/swift/host" )
294- else ( )
294+ elseif (SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD" )
295295 set_property (TARGET ${name}
296296 APPEND PROPERTY INSTALL_RPATH
297297 "$ORIGIN/../lib/swift/host" )
Original file line number Diff line number Diff line change @@ -54,7 +54,7 @@ if (SWIFT_SWIFT_PARSER)
5454 # be found via RPATH.
5555 foreach (sharedlib ${SWIFT_SYNTAX_SHARED_LIBRARIES} )
5656 set (add_origin_rpath)
57- if (SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX" )
57+ if (SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD " )
5858 # At runtime, use swiftCore in the current toolchain.
5959 swift_get_set_rpath_script_file(setrpath_command)
6060 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)
3939 _set_pure_swift_link_flags(${name} "${relpath_to_lib} " )
4040
4141 # Add rpath to 'lib/host'
42- if (SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX" )
42+ if (SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD " )
4343 set_property (TARGET ${name}
4444 APPEND PROPERTY INSTALL_RPATH "$ORIGIN/.." )
4545 endif ()
You can’t perform that action at this time.
0 commit comments