Merge pull request #42071 from etcwilde/ewilde/link-dispatch-blocks-for-concurrency

Fix statically linked concurrency on Linux

Author: etcwilde

stdlib/public/runtime/CMakeLists.txt

@@ -209,10 +209,13 @@ foreach(sdk ${SWIFT_SDKS})
     if(${SWIFT_SDK_${sdk}_OBJECT_FORMAT} STREQUAL ELF)
       string(TOLOWER "${sdk}" lowercase_sdk)
       set(libpthread -lpthread)
+      set(concurrency_libs)
       set(android_libraries)
       if(${sdk} STREQUAL ANDROID)
         set(android_libraries -llog)
         set(libpthread)
+      elseif(SWIFT_CONCURRENCY_USES_DISPATCH)
+        set(concurrency_libs "-ldispatch -lBlocksRuntime")
       endif()
 
       set(linkfile ${lowercase_sdk}/static-stdlib-args.lnk)
@@ -221,6 +224,7 @@ foreach(sdk ${SWIFT_SDKS})
 ${libpthread}
 ${android_libraries}
 -lswiftCore
+${concurrency_libs}
 -lstdc++
 -lm
 -Xlinker -export-dynamic

utils/static-executable-args.lnk

@@ -6,6 +6,8 @@
 -undefined=pthread_once
 -Xlinker
 -undefined=pthread_key_create
+-ldispatch
+-lBlocksRuntime
 -lpthread
 -licui18nswift
 -licuucswift