DNM/build: identify points of incorrectness

This identifies the points where we do not account for linking on
Windows which is required for macros.

Author: compnerd

cmake/modules/AddSwift.cmake

@@ -573,6 +573,9 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
     else()
       message(FATAL_ERROR "Unknown BOOTSTRAPPING_MODE '${ASRLF_BOOTSTRAPPING_MODE}'")
     endif()
+  else()
+    target_link_directories(${target} PRIVATE
+      ${SWIFT_PATH_TO_SWIFT_SDK}/usr/lib/swift/Windows/x86_64)
   endif()
 
   if(SWIFT_SWIFT_PARSER)

lib/CMakeLists.txt

@@ -46,6 +46,12 @@ if (SWIFT_SWIFT_PARSER)
        "${CMAKE_SHARED_LIBRARY_SUFFIX}"
        OUTPUT_VARIABLE SWIFT_SYNTAX_SHARED_LIBRARIES)
 
+  list(TRANSFORM SWIFT_SYNTAX_MODULES PREPEND "${CMAKE_IMPORT_LIBRARY_PREFIX}"
+    OUTPUT_VARIABLE SWIFT_SYNTAX_IMPORT_LIBRARIES)
+  list(TRANSFORM SWIFT_SYNTAX_IMPORT_LIBRARIES APPEND
+    "${CMAKE_IMPORT_LIBRARY_SUFFIX}" OUTPUT_VARIABLE
+    SWIFT_SYNTAX_IMPORT_LIBRARIES)
+
   # Interface library to collect swiftinterfaces and swiftmodules from
   # SwiftSyntax
   add_library(swiftSyntaxLibraries INTERFACE)
@@ -64,6 +70,7 @@ if (SWIFT_SWIFT_PARSER)
       )
     endif()
 
+if(FALSE)
     add_custom_command(
       OUTPUT "${SWIFT_HOST_LIBRARIES_DEST_DIR}/${sharedlib}"
       DEPENDS "${SWIFT_SYNTAX_LIBRARIES_BUILD_DIR}/${sharedlib}"
@@ -81,10 +88,47 @@ if (SWIFT_SWIFT_PARSER)
       DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host"
       COMPONENT compiler
     )
+else()
+
+  set(path "${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/bin/${sharedlib}")
+  cmake_path(NATIVE_PATH path NORMALIZE source)
+
+  set(path "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${sharedlib}")
+  cmake_path(NATIVE_PATH path NORMALIZE destination)
+
+  add_custom_command(OUTPUT ${destination}
+                     DEPENDS "${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/bin/${sharedlib}"
+                     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${source} ${destination})
+  add_custom_target(copy_swiftSyntaxLibrary_${sharedlib}
+                    DEPENDS ${destination}
+                    COMMENT "copying ${sharedlib}")
+  swift_install_in_component(PROGRAMS ${destination}
+                             DESTINATION bin
+                             COMPONENT compiler)
+endif()
 
     add_dependencies(swiftSyntaxLibraries copy_swiftSyntaxLibrary_${sharedlib})
   endforeach()
 
+  foreach(implib ${SWIFT_SYNTAX_IMPORT_LIBRARIES})
+    set(path "${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/lib/swift/host/${implib}")
+    cmake_path(NATIVE_PATH path NORMALIZE source)
+
+    set(path "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib/swift/windows/${implib}")
+    cmake_path(NATIVE_PATH path NORMALIZE destination)
+
+    add_custom_command(OUTPUT ${destination}
+      DEPENDS ${source}
+      COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${source} ${destination})
+    add_custom_target(copy_swiftSyntaxLibrary_${implib}
+      DEPENDS ${destination}
+      COMMENT "Copying ${implib}")
+    swift_install_in_component(PROGRAMS ${destination}
+      DESTINATION lib
+      COMPONENT compiler)
+    add_dependencies(swiftSyntaxLibraries copy_swiftSyntaxLibrary_${implib})
+  endforeach()
+
   # Copy all of the Swift modules from earlyswiftsyntax so they can be found
   # in the same relative place within the build directory as in the final
   # toolchain.

tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

@@ -162,6 +162,9 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)
       file(RELATIVE_PATH relative_hostlib_path "${path}" "${SWIFTLIB_DIR}/host")
       list(APPEND RPATH_LIST "$ORIGIN/${relative_hostlib_path}")
     endif()
+  else()
+    target_link_directories(${target} PRIVATE
+      ${SWIFT_PATH_TO_SWIFT_SDK}/usr/lib/swift/Windows/x86_64)
   endif()
 
   if(SWIFT_SWIFT_PARSER)

tools/driver/CMakeLists.txt

@@ -5,6 +5,8 @@
 # parser is built in.
 function(add_swift_parser_link_libraries target)
   if(SWIFT_SWIFT_PARSER)
+    target_link_directories(${target} PRIVATE
+      ${SWIFT_PATH_TO_SWIFT_SDK}/usr/lib/swift/Windows/x86_64)
     target_link_libraries(${target}
                           PRIVATE swiftCore)