Make the lookup of the PackageDescription dylib fall back on the versioned location if needed #3560
Conversation
This file contains hidden or 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
…ioned location if needed This makes the use of the Manifest API directory (the directory in which PackageDescription.dylib and its interface is located) more robust, so that it works with mismatching toolchains. This is a little tricky to unit-test from inside the codebase, since it involves having an old toolchain compared with the expected one. Existing unit tests make sure there are no regressions.
|
@swift-ci please smoke test |
|
@swift-ci please smoke test linux |
abertelrud
added
the
ready
tomerd
reviewed
Jun 21, 2021
| return manifestAPIDir | ||
| } | ||
|
|
||
| // Otherwise, fall back on the old location (this would indicate that we're using an old toolchain). |
There was a problem hiding this comment.
should we emit some warning in this case, or is it valid?
There was a problem hiding this comment.
This is valid. It's due to the different locations of PackageDescription, both of which are valid, but are different depending on whether the toolchain has the unified implementation or not.
neonichu
approved these changes
Jun 21, 2021
tomerd
approved these changes
Jun 21, 2021
abertelrud
added a commit
to abertelrud/swift-package-manager
that referenced
this pull request
Jun 21, 2021
…e versioned location if needed (swiftlang#3560) This makes the use of the Manifest API directory (the directory in which PackageDescription.dylib and its interface is located) more robust, so that it works with mismatching toolchains. This is a little tricky to unit-test from inside the codebase, since it involves having an old toolchain compared with the expected one. Existing unit tests make sure there are no regressions. (cherry picked from commit 7e0f5e6)
abertelrud
added a commit
that referenced
this pull request
Jun 22, 2021
…e versioned location if needed (#3560) (#3567) This makes the use of the Manifest API directory (the directory in which PackageDescription.dylib and its interface is located) more robust, so that it works with mismatching toolchains. This is a little tricky to unit-test from inside the codebase, since it involves having an old toolchain compared with the expected one. Existing unit tests make sure there are no regressions. (cherry picked from commit 7e0f5e6)
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.
This is a follow-on to #3464 that makes the current SwiftPM able to work with libraries from an older toolchain.
This makes the use of the Manifest API directory (the directory in which PackageDescription.dylib and its interface is located) more robust, so that it works with mismatching toolchains. This is a little tricky to unit-test from inside the codebase, since it involves having an old toolchain compared with the expected one. Existing unit tests make sure there are no regressions.
No change in behavior when the SwiftPM and the toolchain libraries match.