Merge pull request #37721 from gottesmm/pr-a29fee875eff61d38bd51f7fff8c622eaf3d526e

[cmake] Work around a bug in the swift-driver by passing host side libraries from LLVMSupport to linker jobs via a -Xlinker flag.

Author: gottesmm

cmake/modules/SwiftSharedCMakeConfig.cmake

@@ -98,7 +98,49 @@ macro(swift_common_standalone_build_config_llvm product)
   endif()
 
   if(LLVM_ENABLE_ZLIB)
-   find_package(ZLIB REQUIRED)
+    find_package(ZLIB REQUIRED)
+  endif()
+
+  # Work around a bug in the swift-driver that causes the swift-driver to not be
+  # able to accept .tbd files when linking without passing in the .tbd file with
+  # a -Xlinker flag.
+  #
+  # Both clang and swiftc can accept an -Xlinker flag so we use that to pass the
+  # value.
+  if (APPLE)
+    get_target_property(LLVMSUPPORT_INTERFACE_LINK_LIBRARIES LLVMSupport INTERFACE_LINK_LIBRARIES)
+    get_target_property(LLVMSUPPORT_INTERFACE_LINK_OPTIONS LLVMSupport INTERFACE_LINK_OPTIONS)
+    set(new_libraries)
+    set(new_options)
+    if (LLVMSUPPORT_INTERFACE_LINK_OPTIONS)
+      set(new_options ${LLVMSUPPORT_INTERFACE_LINK_OPTIONS})
+    endif()
+    foreach(lib ${LLVMSUPPORT_INTERFACE_LINK_LIBRARIES})
+      # The reason why we also fix link libraries that are specified as a full
+      # target is since those targets can still be a tbd file.
+      #
+      # Example: ZLIB::ZLIB's library path is defined by
+      # ZLIB_LIBRARY_{DEBUG,RELEASE} which can on Darwin have a tbd file as a
+      # value. So we need to work around this until we get a newer swiftc that
+      # can accept a .tbd file.
+      if (TARGET ${lib})
+        list(APPEND new_options "LINKER:$<TARGET_FILE:${lib}>")
+        continue()
+      endif()
+
+      # If we have an interface library dependency that is just a path to a tbd
+      # file, pass the tbd file via -Xlinker so it gets straight to the linker.
+      get_filename_component(LIB_FILENAME_COMPONENT ${lib} LAST_EXT)
+      if ("${LIB_FILENAME_COMPONENT}" STREQUAL ".tbd")
+        list(APPEND new_options "LINKER:${lib}")
+        continue()
+      endif()
+
+      list(APPEND new_libraries "${lib}")
+    endforeach()
+
+    set_target_properties(LLVMSupport PROPERTIES INTERFACE_LINK_LIBRARIES "${new_libraries}")
+    set_target_properties(LLVMSupport PROPERTIES INTERFACE_LINK_OPTIONS "${new_options}")
   endif()
 
   include(AddLLVM)

tools/libSwiftSyntaxParser/CMakeLists.txt

@@ -9,7 +9,8 @@ set(LLVM_EXPORTED_SYMBOL_FILE
 
 add_swift_host_library(libSwiftSyntaxParser SHARED
   c-include-check.c
-  libSwiftSyntaxParser.cpp)
+  libSwiftSyntaxParser.cpp
+  LLVM_LINK_COMPONENTS support)
 if(NOT SWIFT_BUILT_STANDALONE AND NOT CMAKE_C_COMPILER_ID MATCHES Clang)
   add_dependencies(libSwiftSyntaxParser clang)
 endif()

tools/swift-refactor/CMakeLists.txt

@@ -1,6 +1,7 @@
 add_swift_host_tool(swift-refactor
   swift-refactor.cpp
   SWIFT_COMPONENT tools
+  LLVM_LINK_COMPONENTS support
 )
 target_link_libraries(swift-refactor
                       PRIVATE