@@ -538,20 +538,26 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
538
538
set_property(TARGET ${target} APPEND_STRING PROPERTY
539
539
LINK_FLAGS " -lobjc ")
540
540
541
- elseif(SWIFT_HOST_VARIANT_SDK MATCHES " LINUX|ANDROID|OPENBSD|FREEBSD ")
541
+ elseif(SWIFT_HOST_VARIANT_SDK MATCHES " LINUX|ANDROID|OPENBSD|FREEBSD|WINDOWS ")
542
542
set(swiftrt " swiftImageRegistrationObject${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_OBJECT_FORMAT}-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH} ")
543
543
if(ASRLF_BOOTSTRAPPING_MODE MATCHES " HOSTTOOLS|CROSSCOMPILE ")
544
544
# At build time and run time, link against the swift libraries in the
545
545
# installed host toolchain.
546
- get_filename_component(swift_bin_dir ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY)
547
- get_filename_component(swift_dir ${swift_bin_dir} DIRECTORY)
546
+ if(SWIFT_PATH_TO_SWIFT_SDK)
547
+ set(swift_dir " ${SWIFT_PATH_TO_SWIFT_SDK} /usr ")
548
+ else()
549
+ get_filename_component(swift_bin_dir ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY)
550
+ get_filename_component(swift_dir ${swift_bin_dir} DIRECTORY)
551
+ endif()
548
552
set(host_lib_dir " ${swift_dir} /lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR} ")
549
- set(swiftrt " ${host_lib_dir} /${SWIFT_HOST_VARIANT_ARCH}/swiftrt.o ")
553
+ set(host_lib_arch_dir " ${host_lib_dir} /${SWIFT_HOST_VARIANT_ARCH} ")
550
554
555
+ set(swiftrt " ${host_lib_arch_dir} /swiftrt${CMAKE_C_OUTPUT_EXTENSION} ")
551
556
target_link_libraries(${target} PRIVATE ${swiftrt} )
552
557
target_link_libraries(${target} PRIVATE " swiftCore ")
553
558
554
559
target_link_directories(${target} PRIVATE ${host_lib_dir} )
560
+ target_link_directories(${target} PRIVATE ${host_lib_arch_dir} )
555
561
556
562
# At runtime, use swiftCore in the current toolchain.
557
563
# For building stdlib, LD_LIBRARY_PATH will be set to builder's stdlib
0 commit comments