Commit f8ae06f
Cleanup
Previously, we needed to provide both `usr/lib` and `usr/lib/julia` as
elements on the `RPATH`, because `libjulia` lived in `usr/lib`, and
needed to be able to find dependent libraries both within a build tree
(when most libraries live in `usr/lib`) and within an install tree (when
most libraries live in `usr/lib/julia`).
Nowadays, everything is either in `usr/lib` or in `usr/lib/julia` with
the exception of `libjulia`, but since it's really `libjulia-internal`
that does all the `dlopen()`'ing, we can simply use `$$ORIGIN` (or the
equivalent `@loader_path/` on macOS) and completely ignore the rest of
the RPATH shenanigans we do.
(cherry picked from commit 236523f)RPATH settings (#42919)1 parent 242d851 commit f8ae06f
1 file changed
+3
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1233 | 1233 | | |
1234 | 1234 | | |
1235 | 1235 | | |
1236 | | - | |
| 1236 | + | |
1237 | 1237 | | |
1238 | | - | |
| 1238 | + | |
1239 | 1239 | | |
1240 | 1240 | | |
1241 | | - | |
| 1241 | + | |
1242 | 1242 | | |
1243 | 1243 | | |
1244 | 1244 | | |
| |||
0 commit comments