build: improve SourceKit handling of libdispatch #12098

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

Jump to bottom

Merged

compnerd merged 2 commits into swiftlang:master from compnerd:libdispatch

Oct 4, 2017

Member

compnerd commented Sep 25, 2017

Avoid overwriting the swiftCore target in the SourceKit build.
Instead, link to the explicit variant of the swiftCore. This tracks the
dependency better and enables multiple parallel cross-compilations of
the stdlib.

Implicitly link against swiftCore when linking against libdispatch.
Remove the extraneous link against the Blocks runtime on Linux. The
add_sourcekit_executable call already handles this. Ensure that we
enable the swift SDK overlay for libdispatch by sending it the path to
the swift compiler.

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

Member Author

compnerd commented Sep 25, 2017

CC @gottesmm @dgrove-oss

Member Author

compnerd commented Sep 25, 2017

Please test with following pull request:
swiftlang/swift-corelibs-libdispatch#307

@swift-ci please test

Contributor

swift-ci commented Sep 25, 2017

Build failed
Swift Test Linux Platform
Git Sha - 10a2eb5380e1e0fea37ce5d9db0af57e74011297

compnerd force-pushed the libdispatch branch from 10a2eb5 to fce570a Compare

September 25, 2017 18:17

Member Author

compnerd commented Sep 25, 2017

@swift-ci please test

Contributor

swift-ci commented Sep 25, 2017

Build failed
Swift Test OS X Platform
Git Sha - 10a2eb5380e1e0fea37ce5d9db0af57e74011297

Contributor

swift-ci commented Sep 25, 2017

Build failed
Swift Test Linux Platform
Git Sha - 10a2eb5380e1e0fea37ce5d9db0af57e74011297

Member Author

compnerd commented Sep 25, 2017

@swift-ci please test Linux platform

Contributor

swift-ci commented Sep 25, 2017

Build failed
Swift Test Linux Platform
Git Sha - fce570a48b32a2cee318ed2d142a4114bd453a81

jrose-apple requested a review from Rostepher

September 25, 2017 21:09

Contributor

Rostepher commented Sep 26, 2017

I'll take a look at this when I can. If this change is urgent then let me know and I can try to prioritize reviewing.

Member Author

compnerd commented Sep 27, 2017

@Rostepher it's moderately urgent. I think that we want to make sure that the unified build is working properly for everyone. However, until the Darwin builds are switched over, I don't think that we can remove the autotools build.

CC: @das @gottesmm

compnerd force-pushed the libdispatch branch from fce570a to cc35e3b Compare

September 28, 2017 01:57

Member Author

compnerd commented Sep 28, 2017

@swift-ci please test

Contributor

swift-ci commented Sep 28, 2017

Build failed
Swift Test Linux Platform
Git Sha - fce570a48b32a2cee318ed2d142a4114bd453a81

Contributor

swift-ci commented Sep 28, 2017

Build failed
Swift Test OS X Platform
Git Sha - fce570a48b32a2cee318ed2d142a4114bd453a81

compnerd force-pushed the libdispatch branch from cc35e3b to 825c4ed Compare

September 28, 2017 05:00

Member Author

compnerd commented Sep 28, 2017

@swift-ci please test

Contributor

swift-ci commented Sep 28, 2017

Build failed
Swift Test Linux Platform
Git Sha - cc35e3b6f83cf086240856f0c6a280748e381027

Contributor

swift-ci commented Sep 28, 2017

Build failed
Swift Test OS X Platform
Git Sha - cc35e3b6f83cf086240856f0c6a280748e381027

Member Author

compnerd commented Sep 28, 2017

Please test with following pull request:
swiftlang/swift-corelibs-libdispatch#307

@swift-ci please test Linux platform

Contributor

swift-ci commented Sep 28, 2017

Build failed
Swift Test Linux Platform
Git Sha - 825c4ed1c43f072a342eb228a202f2bf1e07242b

Member Author

compnerd commented Sep 28, 2017

Please test with following pull request:
swiftlang/swift-corelibs-libdispatch#307

@swift-ci please clean test Linux platform

Contributor

swift-ci commented Sep 28, 2017

Build failed
Swift Test Linux Platform
Git Sha - 825c4ed1c43f072a342eb228a202f2bf1e07242b

Member Author

compnerd commented Oct 1, 2017

Please test with following pull request:
swiftlang/swift-corelibs-libdispatch#307

@swift-ci please clean test Linux platform

Contributor

swift-ci commented Oct 1, 2017

Build failed
Swift Test Linux Platform
Git Sha - 825c4ed1c43f072a342eb228a202f2bf1e07242b


          build: improve SourceKit handling of libdispatch

9fff09d

Avoid overwriting the `swiftCore` target in the SourceKit build.
Instead, link to the explicit variant of the swiftCore.  This tracks the
dependency better and enables multiple parallel cross-compilations of
the stdlib.

Implicitly link against swiftCore when linking against libdispatch.
Remove the extraneous link against the Blocks runtime on Linux.  The
`add_sourcekit_executable` call already handles this.  Ensure that we
enable the swift SDK overlay for libdispatch by sending it the path to
the swift compiler.

compnerd force-pushed the libdispatch branch from 825c4ed to 9fff09d Compare

October 3, 2017 04:41

Member Author

compnerd commented Oct 3, 2017

@swift-ci please clean test Linux platform

Member Author

compnerd commented Oct 3, 2017

Please test with following pull request:
swiftlang/swift-corelibs-libdispatch#307

@swift-ci please clean test Linux platform

Contributor

swift-ci commented Oct 3, 2017

Build failed
Swift Test Linux Platform
Git Sha - 9fff09d


          Update CMakeLists.txt

e69c443

Member Author

compnerd commented Oct 4, 2017

Please test with following pull request:
swiftlang/swift-corelibs-libdispatch#307

@swift-ci please clean test Linux platform

Member Author

compnerd commented Oct 4, 2017

@swift-ci please clean test macos platform

compnerd mentioned this pull request

build: explicitly link tests to swiftCore swiftOnoneSupport swiftlang/swift-corelibs-libdispatch#307

Merged

Contributor

gottesmm commented Oct 4, 2017

I merged the libdispatch change. Trying a normal linux test.

Contributor

gottesmm commented Oct 4, 2017

@swift-ci test linux

Contributor

gottesmm commented Oct 4, 2017

@swift-ci clean test linux

Contributor

gottesmm commented Oct 4, 2017

(should have done a clean test)

Member Author

compnerd commented Oct 4, 2017

The clean build also succeeded. Lets get this in then!

compnerd merged commit fa500da into swiftlang:master

compnerd deleted the libdispatch branch

October 4, 2017 20:40

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet