Skip to content

Improvements to prebuilt library configuration handling #7433

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

Conversation

xedin
Copy link
Contributor

@xedin xedin commented Mar 29, 2024

A couple of minor improvements:

  • Unify handling of config.json and provided-libraries.json resources and drop use of Bundle (config should always be a part of SDK or a toolchain)
  • Install provided-libraries.json into a toolchain

@xedin xedin force-pushed the improvements-to-provided-libraries-handling branch from fec2c13 to 16b4142 Compare March 29, 2024 20:28
@xedin
Copy link
Contributor Author

xedin commented Mar 29, 2024

@swift-ci please test

@xedin xedin merged commit 26b4ed0 into swiftlang:main Apr 1, 2024
MaxDesiatov added a commit that referenced this pull request Jun 26, 2024
Cherry-pick of
#7496 and
#7433, excluding
[16b4142](16b4142).

**Explanation**: The idea is to enable provided libraries to be a part
of a toolchain, which means that instead of completely eliding them from
a package graph, they need to be handled post-resolution in a special
way and reflected in a build plan for Swift targets (as compiler and
linker arguments). Unified handling of `config.json` and
`provided-libraries.json` resources and dropped use of `Bundle` type
(config should always be a part of SDK or a toolchain).
**Scope**: Localized, touches modules graph resolution and build
planning only in certain configurations.
**Risk**: Low. While the change has a somewhat broad scope, it's NFC for
most builds and has been incubated on `main` for 2 months with no known
issues.
**Testing**: New test cases added and existing ones updated.
**Issue**: rdar://125531670
**Reviewer**: @MaxDesiatov and @bnbarham

---------

Co-authored-by: Pavel Yaskevich <[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.

2 participants