Skip to content

SwiftDriver: add support for resolving the registrar via SDKROOT #1026

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
Mar 7, 2022

Conversation

compnerd
Copy link
Member

@compnerd compnerd commented Mar 5, 2022

This addresses a TODO to resolve the swift registrar via evaluation of
SDKROT environment variable. The path is computed through an order
preference of:

  1. -resource-dir
  2. -sdk
  3. SDKROOT
  4. toolchain relative resource directory

This should enable the use of the swift driver to compile Swift code
without needing to explicitly pass the -sdk parameter on Windows.

This addresses a TODO to resolve the swift registrar via evaluation of
`SDKROT` environment variable.  The path is computed through an order
preference of:
1. `-resource-dir`
2. `-sdk`
3. `SDKROOT`
4. toolchain relative resource directory

This should enable the use of the swift driver to compile Swift code
without needing to explicitly pass the `-sdk` parameter on Windows.
@compnerd
Copy link
Member Author

compnerd commented Mar 5, 2022

@swift-ci please test

@compnerd compnerd merged commit e21e723 into swiftlang:main Mar 7, 2022
@compnerd compnerd deleted the resources branch March 7, 2022 17:29
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