[SourceKit] Link with libdispatch on Linux #2862
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci please test |
1 task
briancroom
force-pushed
the
sourcekit-link-libdispatch
branch
from
23cda11
to
fd913d7
Compare
|
@swift-ci please test |
|
The CI failures appear unrelated. |
|
@gribozavr @akyrtzi @modocache Any feedback here would be appreciated! |
|
@swift-ci please test |
| @@ -1,4 +1,4 @@ | |||
| //===--- Concurrency-Mac.cpp ----------------------------------------------===// | |||
| //===--- Concurrency-libdispatch.cpp --------------------------------------===// | |||
There was a problem hiding this comment.
Excellent rename, thanks!
|
Looks good to me!! Thanks for the continued work on this. |
briancroom
force-pushed
the
sourcekit-link-libdispatch
branch
from
fd913d7
to
a01b11b
Compare
|
I've made some minor adjustments to this to now also address dispatch-related linker failures that were occurring while building the SourceKit unit tests on Linux. |
|
@swift-ci please test |
briancroom
force-pushed
the
sourcekit-link-libdispatch
branch
from
a01b11b
to
f00a817
Compare
sourcekitdInProc, sourcekitd-test, and complete-test need to be explicitly linked with libdispatch on Linux to build properly.
This file builds fine as long as libdispatch is available, even on non-Darwin platforms.
briancroom
force-pushed
the
sourcekit-link-libdispatch
branch
from
f00a817
to
d88bfb6
Compare
1 task
|
@gribozavr How about closing it? Because it has been superseded by #3594 and it has been already merged. |
|
👍 big thanks to @jpsim for seeing this through! |
MaxDesiatov
pushed a commit
that referenced
this pull request
Apr 19, 2021
[pull] swiftwasm from main
This was referenced Jun 14, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What's in this pull request?
Some pains have been taken within SourceKit to make
libdispatchan optional dependency (e.g. theWorkQueueabstraction inSourceKitSupport, however it is neither used everywhere, nor are any implementations available besides the one that useslibdispatch. Sincelibdispatchis intended to be available anywhere Swift is anyway, it seems reasonable to go ahead and use it here, at least for now.This PR adds an include path to the
libdispatchheaders as well an explicit linking dependency onlibdispatchfor Linux. This has NFC in the default build configuration, since SourceKit doesn't build on Linux by default. Note that further work in the build script will be required to makelibdispatchbuild before SourceKit during a standard build.This supersedes #2704
cc @akyrtzi @modocache
Resolved bug number: (SR-1677)
Before merging this pull request to apple/swift repository:
Triggering Swift CI
The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:
Smoke Testing
Validation Testing
Lint Testing
Note: Only members of the Apple organization can trigger swift-ci.