Skip to content

Revert "build: remove SWIFT_NEED_EXPLICIT_LIBDISPATCH (NFC)" #28379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2019
Merged

Revert "build: remove SWIFT_NEED_EXPLICIT_LIBDISPATCH (NFC)" #28379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,10 @@ option(SWIFT_BUILD_SOURCEKIT "Build SourceKit" TRUE)
option(SWIFT_ENABLE_SOURCEKIT_TESTS "Enable running SourceKit tests" ${SWIFT_BUILD_SOURCEKIT})

if(SWIFT_BUILD_SYNTAXPARSERLIB OR SWIFT_BUILD_SOURCEKIT)
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
set(SWIFT_NEED_EXPLICIT_LIBDISPATCH FALSE)
else()
set(SWIFT_NEED_EXPLICIT_LIBDISPATCH TRUE)
if(NOT EXISTS "${SWIFT_PATH_TO_LIBDISPATCH_SOURCE}")
message(SEND_ERROR "SyntaxParserLib and SourceKit require libdispatch on non-Darwin hosts. Please specify SWIFT_PATH_TO_LIBDISPATCH_SOURCE")
endif()
Expand Down Expand Up @@ -951,7 +954,7 @@ if (LLVM_ENABLE_DOXYGEN)
message(STATUS "Doxygen: enabled")
endif()

if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
if(CMAKE_C_COMPILER_ID STREQUAL Clang AND
CMAKE_C_COMPILER_VERSION VERSION_GREATER 3.8
OR LLVM_USE_SANITIZER)
Expand Down
6 changes: 2 additions & 4 deletions tools/SourceKit/lib/Support/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ target_link_libraries(SourceKitSupport PRIVATE
swiftSyntax
clangBasic
clangRewrite)
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
target_link_libraries(SourceKitSupport INTERFACE
dispatch
BlocksRuntime)
if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
target_link_libraries(SourceKitSupport INTERFACE dispatch BlocksRuntime)
endif()

6 changes: 2 additions & 4 deletions tools/SourceKit/tools/complete-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)
else()
target_link_libraries(complete-test PRIVATE sourcekitd)
endif()
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
target_link_libraries(complete-test PRIVATE
dispatch
BlocksRuntime)
if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
target_link_libraries(complete-test PRIVATE dispatch BlocksRuntime)
endif()

if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
Expand Down
6 changes: 2 additions & 4 deletions tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@ if(HAVE_UNICODE_LIBEDIT)
else()
target_link_libraries(sourcekitd-repl PRIVATE sourcekitd)
endif()
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
target_link_libraries(sourcekitd-repl PRIVATE
dispatch
BlocksRuntime)
if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
target_link_libraries(sourcekitd-repl PRIVATE dispatch BlocksRuntime)
endif()

if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
Expand Down
6 changes: 2 additions & 4 deletions tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)
else()
target_link_libraries(sourcekitd-test PRIVATE sourcekitd)
endif()
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
target_link_libraries(sourcekitd-test PRIVATE
dispatch
BlocksRuntime)
if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
target_link_libraries(sourcekitd-test PRIVATE dispatch BlocksRuntime)
endif()

add_dependencies(sourcekitd-test sourcekitdTestOptionsTableGen)
Expand Down
5 changes: 2 additions & 3 deletions tools/libSwiftSyntaxParser/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ endif()

set_property(TARGET libSwiftSyntaxParser APPEND_STRING PROPERTY
COMPILE_FLAGS " -fblocks")
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
target_link_libraries(libSwiftSyntaxParser PRIVATE
BlocksRuntime)
if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
target_link_libraries(libSwiftSyntaxParser PRIVATE BlocksRuntime)
endif()

add_dependencies(parser-lib libSwiftSyntaxParser)
Expand Down
5 changes: 2 additions & 3 deletions tools/swift-syntax-parser-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ endif()

set_property(TARGET swift-syntax-parser-test APPEND_STRING PROPERTY
COMPILE_FLAGS " -fblocks")
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
target_link_libraries(swift-syntax-parser-test PRIVATE
BlocksRuntime)
if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
target_link_libraries(swift-syntax-parser-test PRIVATE BlocksRuntime)
endif()
5 changes: 2 additions & 3 deletions unittests/SyntaxParser/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ endif()

set_property(TARGET SwiftSyntaxParserTests APPEND_STRING PROPERTY
COMPILE_FLAGS " -fblocks")
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
target_link_libraries(SwiftSyntaxParserTests PRIVATE
BlocksRuntime)
if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
target_link_libraries(SwiftSyntaxParserTests PRIVATE BlocksRuntime)
endif()