[SourceKit] Add libdispatch as a dependency for some SourceKit products

sourcekitdInProc, sourcekitd-test, and complete-test need to be explicitly
linked with libdispatch on Linux to build properly.

Author: briancroom

tools/SourceKit/CMakeLists.txt

@@ -506,5 +506,15 @@ include_directories(BEFORE
   ${SOURCEKIT_SOURCE_DIR}/include
 )
 
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+  include_directories(AFTER ${SWIFT_PATH_TO_LIBDISPATCH_SOURCE})
+
+  add_library(dispatch SHARED IMPORTED)
+  set_target_properties(dispatch PROPERTIES
+                        IMPORTED_LOCATION ${SWIFT_PATH_TO_LIBDISPATCH_BUILD}/src/.libs/libdispatch.so)
+
+  set(SOURCEKIT_NEED_EXPLICIT_LIBDISPATCH TRUE)
+endif()
+
 add_subdirectory(lib)
 add_subdirectory(tools)

tools/SourceKit/lib/Support/CMakeLists.txt

@@ -7,14 +7,12 @@ set(SourceKitSupport_sources
   UIDRegistry.cpp
 )
 
-set(SourceKitSupport_Darwin_sources
-  Concurrency-Mac.cpp)
-set(LLVM_OPTIONAL_SOURCES ${SourceKitSupport_Darwin_sources})
-if(APPLE)
-  list(APPEND SourceKitSupport_sources ${SourceKitSupport_Darwin_sources})
+set(SOURCEKIT_SUPPORT_DEPEND swiftBasic clangBasic clangRewrite)
+if(SOURCEKIT_NEED_EXPLICIT_LIBDISPATCH)
+  list(APPEND SOURCEKIT_SUPPORT_DEPEND dispatch BlocksRuntime)
 endif()
 
 add_sourcekit_library(SourceKitSupport
   ${SourceKitSupport_sources}
-  DEPENDS swiftBasic clangBasic clangRewrite
+  DEPENDS ${SOURCEKIT_SUPPORT_DEPEND}
 )

tools/SourceKit/tools/complete-test/CMakeLists.txt

@@ -4,6 +4,10 @@ else()
   set(SOURCEKITD_TEST_DEPEND sourcekitd)
 endif()
 
+if(SOURCEKIT_NEED_EXPLICIT_LIBDISPATCH)
+  set(SOURCEKITD_TEST_DEPEND ${SOURCEKITD_TEST_DEPEND} dispatch)
+endif()
+
 add_sourcekit_executable(complete-test
   complete-test.cpp
   DEPENDS ${SOURCEKITD_TEST_DEPEND}

tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt

@@ -8,6 +8,10 @@ else()
   set(SOURCEKITD_TEST_DEPEND sourcekitd)
 endif()
 
+if(SOURCEKIT_NEED_EXPLICIT_LIBDISPATCH)
+  set(SOURCEKITD_TEST_DEPEND ${SOURCEKITD_TEST_DEPEND} dispatch)
+endif()
+
 add_sourcekit_executable(sourcekitd-test
   sourcekitd-test.cpp
   TestOptions.cpp

tools/SourceKit/tools/sourcekitd/bin/InProc/CMakeLists.txt

@@ -23,6 +23,10 @@ else()
   )
 endif()
 
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+  target_link_libraries(sourcekitdInProc PUBLIC BlocksRuntime)
+endif()
+
 if (SOURCEKIT_BUILT_STANDALONE)
   # Create the symlinks necessary to find the swift runtime.
   add_custom_command(TARGET sourcekitdInProc PRE_BUILD

utils/build-script-impl

@@ -1987,6 +1987,8 @@ for host in "${ALL_HOSTS[@]}"; do
                     -DSWIFT_PATH_TO_LLVM_BUILD:PATH="${llvm_build_dir}"
                     -DSWIFT_PATH_TO_CMARK_SOURCE:PATH="${CMARK_SOURCE_DIR}"
                     -DSWIFT_PATH_TO_CMARK_BUILD:PATH="$(build_directory ${host} cmark)"
+                    -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE:PATH="${LIBDISPATCH_SOURCE_DIR}"
+                    -DSWIFT_PATH_TO_LIBDISPATCH_BUILD:PATH="$(build_directory ${host} libdispatch)"
                 )
 
                 if [[ "${CMAKE_GENERATOR}" == "Xcode" ]] ; then