Link more compatibility libraries when cross compiling

Those may be needed when cross-compiling x86_64 when building on Apple
Silicon

Supports rdar://90307965

Author: edymtt

cmake/modules/AddSwift.cmake

@@ -466,8 +466,10 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
       # This requires to explicitly add all the needed compatibility libraries. We
       # can take them from the current build.
       set(vsuffix "-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH}")
-      set(conctarget "swiftCompatibilityConcurrency${vsuffix}")
-      target_link_libraries(${target} PUBLIC ${conctarget})
+      foreach(compat_library IN ITEMS "Concurrency" "DynamicReplacements" "50" "51")
+        set(conctarget "swiftCompatibility${compat_library}${vsuffix}")
+        target_link_libraries(${target} PUBLIC ${conctarget})
+      endforeach()
 
       # Add the SDK directory for the host platform.
       target_link_directories(${target} PRIVATE "${sdk_dir}")

tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

@@ -52,8 +52,10 @@ function(add_sourcekitd_swifrt_linking target path HAS_SWIFT_MODULES)
         # This requires to explicitly add all the needed compatibility libraries. We
         # can take them from the current build.
         set(vsuffix "-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH}")
-        set(conctarget "swiftCompatibilityConcurrency${vsuffix}")
-        target_link_libraries(${target} PUBLIC ${conctarget})
+        foreach(compat_library IN ITEMS "Concurrency" "DynamicReplacements" "50" "51")
+          set(conctarget "swiftCompatibility${compat_library}${vsuffix}")
+          target_link_libraries(${target} PUBLIC ${conctarget})
+        endforeach()
 
         # Add the SDK directory for the host platform.
         target_link_directories(${target} PRIVATE "${sdk_dir}")