[5.9] PackageModel: honour .librarian
for toolsets
#6770
Merged
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.
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)