Skip to content

[windows] add usr/lib/swift/clang to the toolchain installer #336

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
Sep 9, 2024

Conversation

hyp
Copy link
Contributor

@hyp hyp commented Sep 5, 2024

this directory contains clang's resource headers that are needed by the clang embedded inside of the swift compiler, as it assumes its clang resources are in usr/lib/swift/clang, as opposed to standalone clang looking in usr/lib/clang/<clang_version>

this directory contains clang's resource headers that are needed by the clang embedded inside of the swift compiler, as it assumes its clang resources are in usr/lib/swift/clang, as opposed to standalone clang looking in usr/lib/clang/<clang_version>
@hyp hyp requested a review from compnerd September 5, 2024 18:35
@hyp hyp requested a review from shahmishal as a code owner September 5, 2024 18:35
@hyp
Copy link
Contributor Author

hyp commented Sep 5, 2024

Testing it right now.

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is rather unfortunate.

@stevapple
Copy link
Contributor

It’s a pity that we didn’t have it fixed two years ago😳

@compnerd
Copy link
Member

compnerd commented Sep 5, 2024

@stevapple yeah, it still is not needed for Windows itself, but is needed for cross-compilation. I think that we need to find a better solution here still, but this is a stop gap to get the Android cross-compilation support working.

@hyp
Copy link
Contributor Author

hyp commented Sep 9, 2024

I validated that this change installs the directory as expected in the toolchain MSI.

@hyp hyp merged commit 537bce7 into main Sep 9, 2024
@hyp hyp deleted the _usr_lib_swift_clang branch September 9, 2024 15:22
hyp added a commit that referenced this pull request Nov 18, 2024
[windows] add usr/lib/swift/clang to the toolchain installer

(cherry picked from commit 537bce7)
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