Skip to content

Commit d3d211b

Browse files
committed
link libswiftCore when building SourceKit on Linux
since libdispatch now includes a Swift overlay
1 parent d1d7525 commit d3d211b

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

tools/SourceKit/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,10 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
513513
set_target_properties(dispatch PROPERTIES
514514
IMPORTED_LOCATION ${SWIFT_PATH_TO_LIBDISPATCH_BUILD}/src/.libs/libdispatch.so)
515515

516+
add_library(swiftCore SHARED IMPORTED)
517+
set_target_properties(swiftCore PROPERTIES
518+
IMPORTED_LOCATION ${SOURCEKIT_BINARY_DIR}/lib/swift/linux/libswiftCore.so)
519+
516520
set(SOURCEKIT_NEED_EXPLICIT_LIBDISPATCH TRUE)
517521
endif()
518522

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ else()
55
endif()
66

77
if(SOURCEKIT_NEED_EXPLICIT_LIBDISPATCH)
8-
set(SOURCEKITD_TEST_DEPEND ${SOURCEKITD_TEST_DEPEND} dispatch)
8+
set(SOURCEKITD_TEST_DEPEND ${SOURCEKITD_TEST_DEPEND} dispatch swiftCore)
99
endif()
1010

1111
add_sourcekit_executable(complete-test

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ if(HAVE_UNICODE_LIBEDIT)
88
set(SOURCEKITD_REPL_DEPEND sourcekitd)
99
endif()
1010

11+
if(SOURCEKIT_NEED_EXPLICIT_LIBDISPATCH)
12+
set(SOURCEKITD_REPL_DEPEND ${SOURCEKITD_REPL_DEPEND} dispatch swiftCore)
13+
endif()
14+
1115
add_sourcekit_executable(sourcekitd-repl
1216
sourcekitd-repl.cpp
1317
DEPENDS ${SOURCEKITD_REPL_DEPEND} edit

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ else()
99
endif()
1010

1111
if(SOURCEKIT_NEED_EXPLICIT_LIBDISPATCH)
12-
set(SOURCEKITD_TEST_DEPEND ${SOURCEKITD_TEST_DEPEND} dispatch)
12+
set(SOURCEKITD_TEST_DEPEND ${SOURCEKITD_TEST_DEPEND} dispatch swiftCore)
1313
endif()
1414

1515
add_sourcekit_executable(sourcekitd-test

0 commit comments

Comments
 (0)