Check the runpaths for more ELF binaries #113
Conversation
| # CHECK-SG-NOT: {{.*}} {{\(RPATH\)|\(RUNPATH\)}} {{.*}}:/usr/lib/swift/linux | ||
| # | ||
| # RUN: %{readelf} -d %{package_path}/usr/lib/swift/linux/libswiftSwiftOnoneSupport.so | %{FileCheck} --check-prefix CHECK-SON %s | ||
| # RUN: %{readelf} -d %{package_path}/usr/lib/swift/linux/%{linux_arch}/libswiftSwiftOnoneSupport.so | %{FileCheck} --check-prefix CHECK-SON %s | ||
| # CHECK-SON: {{.*}} {{\(RPATH\)|\(RUNPATH\)}} {{.*}}$ORIGIN{{[^/]}} |
There was a problem hiding this comment.
As long as I'm updating this file, I added these $ORIGIN checks too, which are needed for the runtime libraries to find each other.
|
@bnbarham, 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. |
Make sure they include $ORIGIN, so they can find each other in the same toolchain.
|
Removed the changes to add the architecture to the runpath since the Swift devs want to take a different approach, leaving only the other runpath checks I added. One last CI run and this can go in, @bnbarham. |
finagolfin
changed the title
|
Passed CI, checked the linux log to make sure this test was run: This can be merged now. |
|
Ping @bnbarham, ready for merge. |
|
Sorry about the delay there, thanks for the ping. The last comment got lost amongst many other emails 😅 |
This is needed for swiftlang/swift#63782, which changes the Unix toolchain to look for libraries in architecture-specific directories.Make sure they include
$ORIGIN, so they can find each other in the same toolchain.