Skip to content
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

Closed
wants to merge 1 commit into from

Conversation

al45tair
Copy link
Contributor

Non-Darwin platforms don't support fat binaries, so add the architecture to the path.

rdar://123504610

Non-Darwin platforms don't support fat binaries, so add the
architecture to the path.

rdar://123504610
@al45tair al45tair requested a review from MaxDesiatov February 23, 2024 16:15
@al45tair al45tair requested a review from a team as a code owner February 23, 2024 16:15
@al45tair
Copy link
Contributor Author

@swift-ci Please smoke test

Copy link
Contributor

@MaxDesiatov MaxDesiatov left a comment

Choose a reason for hiding this comment

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

Yes please! 🥳

@finagolfin
Copy link
Member

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.

@al45tair
Copy link
Contributor Author

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).

@finagolfin
Copy link
Member

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:

> ls usr/lib/swift/linux/*swiftmodule
usr/lib/swift/linux/_Backtracing.swiftmodule:
x86_64-unknown-linux-gnu.private.swiftinterface  x86_64-unknown-linux-gnu.swiftdoc  x86_64-unknown-linux-gnu.swiftinterface  x86_64-unknown-linux-gnu.swiftmodule

usr/lib/swift/linux/_Concurrency.swiftmodule:
x86_64-unknown-linux-gnu.private.swiftinterface  x86_64-unknown-linux-gnu.swiftdoc  x86_64-unknown-linux-gnu.swiftinterface  x86_64-unknown-linux-gnu.swiftmodule

usr/lib/swift/linux/CxxStdlib.swiftmodule:
x86_64-unknown-linux-gnu.private.swiftinterface  x86_64-unknown-linux-gnu.swiftdoc  x86_64-unknown-linux-gnu.swiftinterface  x86_64-unknown-linux-gnu.swiftmodule

usr/lib/swift/linux/Cxx.swiftmodule:
x86_64-unknown-linux-gnu.private.swiftinterface  x86_64-unknown-linux-gnu.swiftdoc  x86_64-unknown-linux-gnu.swiftinterface  x86_64-unknown-linux-gnu.swiftmodule

usr/lib/swift/linux/_Differentiation.swiftmodule:
x86_64-unknown-linux-gnu.private.swiftinterface  x86_64-unknown-linux-gnu.swiftdoc  x86_64-unknown-linux-gnu.swiftinterface  x86_64-unknown-linux-gnu.swiftmodule

usr/lib/swift/linux/Distributed.swiftmodule:
x86_64-unknown-linux-gnu.private.swiftinterface  x86_64-unknown-linux-gnu.swiftdoc  x86_64-unknown-linux-gnu.swiftinterface  x86_64-unknown-linux-gnu.swiftmodule

usr/lib/swift/linux/Glibc.swiftmodule:
x86_64-unknown-linux-gnu.private.swiftinterface  x86_64-unknown-linux-gnu.swiftdoc  x86_64-unknown-linux-gnu.swiftinterface  x86_64-unknown-linux-gnu.swiftmodule

usr/lib/swift/linux/Observation.swiftmodule:
x86_64-unknown-linux-gnu.private.swiftinterface  x86_64-unknown-linux-gnu.swiftdoc  x86_64-unknown-linux-gnu.swiftinterface  x86_64-unknown-linux-gnu.swiftmodule

usr/lib/swift/linux/RegexBuilder.swiftmodule:
x86_64-unknown-linux-gnu.private.swiftinterface  x86_64-unknown-linux-gnu.swiftdoc  x86_64-unknown-linux-gnu.swiftinterface  x86_64-unknown-linux-gnu.swiftmodule

usr/lib/swift/linux/_RegexParser.swiftmodule:
x86_64-unknown-linux-gnu.private.swiftinterface  x86_64-unknown-linux-gnu.swiftdoc  x86_64-unknown-linux-gnu.swiftinterface  x86_64-unknown-linux-gnu.swiftmodule

usr/lib/swift/linux/_StringProcessing.swiftmodule:
x86_64-unknown-linux-gnu.private.swiftinterface  x86_64-unknown-linux-gnu.swiftdoc  x86_64-unknown-linux-gnu.swiftinterface  x86_64-unknown-linux-gnu.swiftmodule

usr/lib/swift/linux/SwiftOnoneSupport.swiftmodule:
x86_64-unknown-linux-gnu.private.swiftinterface  x86_64-unknown-linux-gnu.swiftdoc  x86_64-unknown-linux-gnu.swiftinterface  x86_64-unknown-linux-gnu.swiftmodule

usr/lib/swift/linux/Swift.swiftmodule:
x86_64-unknown-linux-gnu.private.swiftinterface  x86_64-unknown-linux-gnu.swiftdoc  x86_64-unknown-linux-gnu.swiftinterface  x86_64-unknown-linux-gnu.swiftmodule

@al45tair
Copy link
Contributor Author

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.)

@al45tair al45tair closed this Feb 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants