Skip to content
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

Support running tests that require building with a Swift 5.10 toolchain #1366

Merged
merged 2 commits into from
May 30, 2024

Conversation

ahoppen
Copy link
Contributor

@ahoppen ahoppen commented May 29, 2024

When we detect that we’re running using a 5.10 toolchain, adjust the compiler arguments that we received from SwiftPM to drop any /Modules suffixes in the build directory, to account for the fact that 5.10 stores the modules one directory higher up (swiftlang/swift-package-manager#7103).

…hain`

This allows us to inspect the Swift version and fix up compiler arguments from SwiftPM to account for an older version of SwiftPM being invoked using `swift build` than the one that’s bundled in-process with SourceKit-LSP.
When we detect that we’re running using a 5.10 toolchain, adjust the compiler arguments that we received from SwiftPM to drop any `/Modules` suffixes in the build directory, to account for the fact that 5.10 stores the modules one directory higher up (swiftlang/swift-package-manager#7103).
@ahoppen
Copy link
Contributor Author

ahoppen commented May 29, 2024

@swift-ci Please test

@ahoppen ahoppen merged commit 942bb0a into swiftlang:main May 30, 2024
3 checks passed
@ahoppen ahoppen deleted the fix-modules-include-directory branch May 30, 2024 14:49
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.

3 participants