Merge pull request #73065 from edymtt/edymtt/use-hostcompatibilitylibs-for-all-bootstrapping-modes

CMake: ensure Swift host tools depend on HostCompatibilityLibs target

Author: edymtt

cmake/modules/AddSwift.cmake

@@ -467,6 +467,17 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
 
     set(sdk_dir "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}/usr/lib/swift")
 
+    # HostCompatibilityLibs is defined as an interface library that
+    # does not generate any concrete build target
+    # (https://cmake.org/cmake/help/latest/command/add_library.html#interface-libraries)
+    # In order to specify a dependency to it using `add_dependencies`
+    # we need to manually "expand" its underlying targets
+    get_property(compatibility_libs
+      TARGET HostCompatibilityLibs
+      PROPERTY INTERFACE_LINK_LIBRARIES)
+    set(compatibility_libs_path
+      "${SWIFTLIB_DIR}/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}/${SWIFT_HOST_VARIANT_ARCH}")
+
     # If we found a swift compiler and are going to use swift code in swift
     # host side tools but link with clang, add the appropriate -L paths so we
     # find all of the necessary swift libraries on Darwin.
@@ -505,8 +516,11 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
       target_link_directories(${target} PRIVATE "${sdk_dir}")
 
       # A backup in case the toolchain doesn't have one of the compatibility libraries.
-      target_link_directories(${target} PRIVATE
-        "${SWIFTLIB_DIR}/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
+      # We are using on purpose `add_dependencies` instead of `target_link_libraries`,
+      # since we want to ensure the linker is pulling the matching archives
+      # only if needed
+      target_link_directories(${target} PRIVATE "${compatibility_libs_path}")
+      add_dependencies(${target} ${compatibility_libs})
 
       # Include the abi stable system stdlib in our rpath.
       set(swift_runtime_rpath "/usr/lib/swift")
@@ -518,8 +532,11 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
       target_link_directories(${target} PRIVATE ${bs_lib_dir})
 
       # Required to pick up the built libswiftCompatibility<n>.a libraries
-      target_link_directories(${target} PRIVATE
-        "${SWIFTLIB_DIR}/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
+      # We are using on purpose `add_dependencies` instead of `target_link_libraries`,
+      # since we want to ensure the linker is pulling the matching archives
+      # only if needed
+      target_link_directories(${target} PRIVATE "${compatibility_libs_path}")
+      add_dependencies(${target} ${compatibility_libs})
 
       # At runtime link against the built swift libraries from the current
       # bootstrapping stage.