Skip to content

[5.7] Frontend: add an additional search path for swift modules #59073

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
Jun 1, 2022

Conversation

compnerd
Copy link
Member

This setups the frontend to search both an architecture suffixed and
unsuffixed path. This improves the multi-architecture setup for
Windows, enabling it use the directory form of the swift modules with
the architectures overlaying in the swift module and leaving the arch
suffixed directory for the import libraries.

This can be fully generalized as this also enables Linux to use the
multi-architecture search path for the swift modules enabling it to
eventually adopt a SDK model as well.

This setups the frontend to search both an architecture suffixed and
unsuffixed path.  This improves the multi-architecture setup for
Windows, enabling it use the directory form of the swift modules with
the architectures overlaying in the swift module and leaving the arch
suffixed directory for the import libraries.

This can be fully generalized as this also enables Linux to use the
multi-architecture search path for the swift modules enabling it to
eventually adopt a SDK model as well.
@compnerd compnerd requested a review from a team as a code owner May 25, 2022 16:50
@compnerd
Copy link
Member Author

Please test with following PRs:
swiftlang/swift-installer-scripts#120

@swift-ci please build toolchain Windows platform

@compnerd compnerd closed this May 26, 2022
@compnerd compnerd reopened this May 26, 2022
@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

Please test with following PRs:
swiftlang/swift-installer-scripts#120

@swift-ci please build toolchain Windows platform

@compnerd
Copy link
Member Author

The Windows toolchain error is unrelated to this change - there is something missing on the 5.7 branch for Foundation on Windows.

Nominating this for 5.7 as it helps the Windows SDK layout (allowing the removal of the duplicated architecture). It is adding an additional module search path to the non-Darwin paths, which should be extremely low risk for Darwin, and low risk for Linux and Windows as it simply adds an additional search path.

CC: @airspeedswift

@stephentyrone
Copy link
Contributor

stephentyrone commented May 31, 2022

LGTM. I'll let one of the branch owners more versed in CMake sign off on it, though.

@compnerd compnerd changed the title Frontend: add an additional search path for swift modules [5.7] Frontend: add an additional search path for swift modules Jun 1, 2022
@compnerd compnerd added the r5.7 label Jun 1, 2022
@compnerd compnerd merged commit 4e208a6 into swiftlang:release/5.7 Jun 1, 2022
@compnerd compnerd deleted the 5.7-unarch branch June 1, 2022 16:09
@AnthonyLatsis AnthonyLatsis added 🍒 release cherry pick Flag: Release branch cherry picks swift 5.7 labels Jan 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🍒 release cherry pick Flag: Release branch cherry picks swift 5.7
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants