Merge pull request #3594 from jpsim/sourcekit-link-libdispatch

[SourceKit] Link with libdispatch & libswiftCore on Linux

Author: akyrtzi

tools/SourceKit/CMakeLists.txt

@@ -506,5 +506,19 @@ 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)
+
+  add_library(swiftCore SHARED IMPORTED)
+  set_target_properties(swiftCore PROPERTIES
+                        IMPORTED_LOCATION ${SOURCEKIT_BINARY_DIR}/lib/swift/linux/libswiftCore.so)
+
+  set(SOURCEKIT_NEED_EXPLICIT_LIBDISPATCH TRUE)
+endif()
+
 add_subdirectory(lib)
 add_subdirectory(tools)

tools/SourceKit/lib/Support/CMakeLists.txt

@@ -1,4 +1,5 @@
 set(SourceKitSupport_sources
+  Concurrency-libdispatch.cpp
   FuzzyStringMatcher.cpp
   Logging.cpp
   ImmutableTextBuffer.cpp
@@ -7,14 +8,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/lib/Support/Concurrency-Mac.cpp renamed to tools/SourceKit/lib/Support/Concurrency-libdispatch.cpp

@@ -1,4 +1,4 @@
-//===--- Concurrency-Mac.cpp ----------------------------------------------===//
+//===--- Concurrency-libdispatch.cpp --------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //

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 swiftCore)
+endif()
+
 add_sourcekit_executable(complete-test
   complete-test.cpp
   DEPENDS ${SOURCEKITD_TEST_DEPEND}

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

@@ -8,6 +8,10 @@ if(HAVE_UNICODE_LIBEDIT)
     set(SOURCEKITD_REPL_DEPEND sourcekitd)
   endif()
 
+  if(SOURCEKIT_NEED_EXPLICIT_LIBDISPATCH)
+    set(SOURCEKITD_REPL_DEPEND ${SOURCEKITD_REPL_DEPEND} dispatch swiftCore)
+  endif()
+
   add_sourcekit_executable(sourcekitd-repl
     sourcekitd-repl.cpp
     DEPENDS ${SOURCEKITD_REPL_DEPEND} edit

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 swiftCore)
+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

@@ -1979,6 +1979,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