Make deriveTargetSwiftSDK public #7925
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Aug 28, 2024
|
@swift-ci test |
MaxDesiatov
approved these changes
Aug 28, 2024
kabiroberai
changed the title
kabiroberai
requested review from
bnbarham,
jakepetroules,
francescomikulis,
xedin,
dschaefer2,
shawnhyam,
bripeticca,
plemarquand and
owenv
as code owners
|
@MaxDesiatov think we're ready to merge this! |
MaxDesiatov
pushed a commit
to swiftlang/sourcekit-lsp
that referenced
this pull request
Aug 29, 2024
Using `SwiftSDK.deriveTargetSwiftSDK`, which is the same method that SwiftPM's own CLI tools use to determine the SDK from passed-in info (target `--triple`, `--swift-sdk`, and host sdk). This allows us to better uphold the contract in the [Configuration File](https://github.com/swiftlang/sourcekit-lsp/blob/d11c101ce210ad23f917cf06fb13a7d9e243872b/Documentation/Configuration%20File.md#structure) docs, namely that the `swiftSDK` param is "Equivalent to SwiftPM's `--swift-sdk` option" and similarly for `triple`. As concrete examples of where (AFAICT) the current implementation diverges: - Passing a `--triple` of `wasm32-unknown-wasi` to `swift-build` will use the toolchain-integrated Wasm SDK if one exists. Passing the same value to sourcekit-lsp does not do this. - Perhaps more relevant: after landing swiftlang/swift-package-manager#6828, this change will make it so that building for iOS is as simple as setting `"triple": "arm64-apple-ios"` in the config! Currently, it's necessary to set C/Swift flags and hardcode the sysroot. Should close #1587. This PR depends on: - swiftlang/swift-package-manager#7925
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Used by swiftlang/sourcekit-lsp#1643
Motivation:
Allows us to achieve parity between sourcekit-lsp's configuration options and SwiftPM's
--triple/--swift-sdk.Modifications:
Make
SwiftSDK.deriveTargetSwiftSDKpublicResult:
See swiftlang/sourcekit-lsp#1643