[CMake][llbuildSwift] change the runpath to an architecture-specific directory on ELF platforms #868
Conversation
|
@etcwilde, now that this passed the CI on the linked compiler pull, looking for review so I can get this in before the upcoming 5.9 branch. Please don't merge though, as all 11 pulls will have to be merged together. |
| @@ -1,3 +1,37 @@ | |||
| # Returns the current architecture name in a variable | |||
There was a problem hiding this comment.
Why replicate this rather than from SwiftSupport.cmake ?
There was a problem hiding this comment.
LLBUILD doesn't have a SwiftSupport.cmake yet, but we should probably pull that from somewhere.
@compnerd is there a canonical version somewhere? The one in swift-system is a few lines longer from a quick glance, so probably handles more architectures; https://github.com/apple/swift-system/blob/main/cmake/modules/SwiftSupport.cmake.
There was a problem hiding this comment.
The one in swift-system is a few lines longer from a quick glance, so probably handles more architectures;
I just checked and the only difference is that that one doesn't handle wasm32, whereas this one is missing the all-caps ARM64. Not particularly important, can always add it later if wanted, as I'd like to get this in with the other pulls before the 5.9 branch.
…directory on ELF platforms This is needed for swiftlang/swift#63782, which changes the Unix toolchain to look for libraries in architecture-specific directories.
|
Updated this pull to account for my just-merged #870. |
|
Closing since the Swift devs want to take a different approach. |
This is needed for swiftlang/swift#63782, which changes the Unix toolchain to look for libraries in architecture-specific directories.
get_swift_host_arch()was copied over from the libdispatch CMake config and slightly updated and condensed.