Skip to content

Pass libdispatch source and build directories to Swift PM #2693

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.

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
Jun 6, 2016

Conversation

seabaylea
Copy link
Contributor

What's in this pull request?

The new dependency between Swift Package Manager and Foundation means that there's a compilation failure if Dispatch is built into Foundation.

This passes the libdispatch source and build directories to Swift PM build script to that it can add them to the import paths.

Resolved bug number: (SR-)

N/A

Before merging this pull request to apple/swift repository:

  • Test pull request on Swift continuous integration.

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

Platform Comment
All supported platforms @swift-ci Please smoke test
All supported platforms @swift-ci Please smoke test and merge
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

Validation Testing

Platform Comment
All supported platforms @swift-ci Please test
All supported platforms @swift-ci Please test and merge
OS X platform @swift-ci Please test OS X platform
OS X platform @swift-ci Please benchmark
Linux platform @swift-ci Please test Linux platform

Lint Testing

Language Comment
Python @swift-ci Please Python lint

Note: Only members of the Apple organization can trigger swift-ci.

@ddunbar
Copy link
Contributor

ddunbar commented May 25, 2016

See also: swiftlang/swift-package-manager#369

@seabaylea
Copy link
Contributor Author

@gribozavr Would it be possible to get a review of this - if your happy with it I'll do the work to update for the merge conflict.

Note that the counterpart in SwiftPM is already merged.

@seabaylea
Copy link
Contributor Author

Ok, I've gone ahead and fixed the merge conflict and updated the branch.

@gribozavr
Copy link
Contributor

gribozavr commented Jun 6, 2016

LGTM.

@swift-ci Please test and merge

@swift-ci swift-ci merged commit 24f2b3f into swiftlang:master Jun 6, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants