Skip to content

PackageModel: honour .librarian for toolsets #6688

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
Jul 10, 2023

Conversation

compnerd
Copy link
Member

When defining a custom toolset, a specified librarian shall be given precedence over the platform's librarian. Use this to repair the toolset test on Windows where ar is unavailable. This test used to succeed due to the leaking of the host tools.

When defining a custom toolset, a specified librarian shall be given
precedence over the platform's librarian.  Use this to repair the
toolset test on Windows where `ar` is unavailable.  This test used to
succeed due to the leaking of the host tools.
@compnerd
Copy link
Member Author

@swift-ci please smoke test

@tomerd tomerd merged commit 4d63d66 into swiftlang:main Jul 10, 2023
@compnerd compnerd deleted the respect-the-librarian branch July 10, 2023 18:14
MaxDesiatov pushed a commit that referenced this pull request Aug 1, 2023
When defining a custom toolset, a specified librarian shall be given
precedence over the platform's librarian.  Use this to repair the
toolset test on Windows where `ar` is unavailable.  This test used to
succeed due to the leaking of the host tools.

(cherry picked from commit 4d63d66)
MaxDesiatov added a commit that referenced this pull request Aug 14, 2023
Cherry-pick of #6688.

When defining a custom toolset, a specified librarian shall be given precedence over the platform's librarian.  Use this to repair the toolset test on Windows where `ar` is unavailable.  This test used to succeed due to the leaking of the host tools.

This fixes a bug reproducible when cross-compiling projects with dependencies to any platform, including Linux.

Risk: low, only affects cross-compilation with SwiftPM, which is not widely used yet.

(cherry picked from commit 4d63d66)

Co-authored-by: Saleem Abdulrasool <[email protected]>
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