-
Notifications
You must be signed in to change notification settings - Fork 10.4k
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
[Build] Add the arch to the library subdir for non-Darwin. #71842
Conversation
Non-Darwin platforms don't support fat binaries, so add the architecture to the path. rdar://123504610
@swift-ci Please smoke test |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes please! 🥳
Heh, as the many failing tests show, you will need a lot more than this. I implemented it fully in #63782 last year, along with all the small pulls for other Swift repos linked there, but gave up once this simple approach was rejected. I wish you luck if you want to try again, as I still feel this was a better short-term approach, while full triples can wait till someone wants to take on that larger task. |
FWIW, I'm not trying to fix it in the general case; we should use triples for that, as discussed previously. If this breaks things under normal operation, I'll likely conditionalise it so it only happens for what I'm working on (where it does work). |
All the failing tests on the CI suggest it doesn't work. Hold on, looking into this further, this method is only used to place the swiftmodule files? Based on your commit comment, I thought you were moving binaries. The swiftmodule files are already named by triple, so there's no need to move them:
|
Yeah, in fact I don’t think I need this change after all. (It was just a tiny part of some changes I’ve been working on in a branch.) |
Non-Darwin platforms don't support fat binaries, so add the architecture to the path.
rdar://123504610