Skip to content

Bifurcate SwiftPM library locations #7212

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
Dec 21, 2023

Conversation

neonichu
Copy link
Contributor

When using SwiftPM PackageDescription or PackagePlugin libraries in an inferior, the corresponding modules are now found in a "Modules" subdirectory, but I didn't adjust the include paths being used for this. It appears that prior versions of the Swift compiler would search for modules recursively but recent versions of 5.11 have stopped doing so, unmasking this existing issue.

@neonichu neonichu self-assigned this Dec 20, 2023
@neonichu
Copy link
Contributor Author

@swift-ci please test

Copy link
Contributor

@MaxDesiatov MaxDesiatov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we can come up with additional tests for this, since the original PR breaking this was somehow merged and ended up in the dev snapshot?

@neonichu
Copy link
Contributor Author

I wonder if we can come up with additional tests for this, since the original PR breaking this was somehow merged and ended up in the dev snapshot?

The only way I can explain this is that the behavior of the compiler was changed in between merging the original PR and now. I am unable to reproduce the issue using older compilers, but with a very recent one, it reproduces locally for me in many tests.

@neonichu
Copy link
Contributor Author

Hm, not sure I understand the self hosted macOS failures

@neonichu
Copy link
Contributor Author

Installed 14C18 locally, but no luck reproducing the self hosted macOS failure 🤔

@neonichu
Copy link
Contributor Author

Oh wait, I wasn't able to reproduce it in Xcode, but I am on the CLI. The issue is of course that we depend on the superior having built the modules, so older versions of SwiftPM actually don't produce the "Modules" subdirectory.

When using SwiftPM `PackageDescription` or `PackagePlugin` libraries in an inferior, the corresponding modules are now found in a "Modules" subdirectory, but I didn't adjust the include paths being used for this. It appears that prior versions of the Swift compiler would search for modules recursively but recent versions of 5.11 have stopped doing so, unmasking this existing issue.
@neonichu neonichu force-pushed the bifurcate-swiftpm-library-locations branch from 7a348b0 to f771689 Compare December 20, 2023 21:37
@neonichu
Copy link
Contributor Author

@swift-ci please test

@neonichu
Copy link
Contributor Author

@swift-ci please test windows

1 similar comment
@neonichu
Copy link
Contributor Author

@swift-ci please test windows

@neonichu neonichu merged commit af36a11 into main Dec 21, 2023
@neonichu neonichu deleted the bifurcate-swiftpm-library-locations branch December 21, 2023 02:27
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.

2 participants