Skip to content

Commit 3596b4a

Browse files
committed
Add -rpath-link for transitive dependencies
1 parent fef6ecc commit 3596b4a

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

.buildkite/test_linux.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ steps:
33
plugins:
44
- JuliaCI/julia#v1:
55
version: "${JULIA_VERSION?}"
6+
arch: "${ARCH?}"
67
- staticfloat/sandbox#v1:
78
rootfs_url: "${ROOTFS_URL?}"
89
rootfs_treehash: "${ROOTFS_HASH?}"
@@ -13,7 +14,7 @@ steps:
1314
- staticfloat/metahook#sf/windows_backslashes:
1415
pre-command: |
1516
# Upgrade our debian package to bullseye (wowza)
16-
if [[ $$(uname -m) == "x86_64" ]] || [[ $$(uname -m) == "aarch64" ]]; then
17+
if [[ "${ARCH?}" == "x86_64" ]] || [[ "${ARCH?}" == "aarch64" ]]; then
1718
echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
1819
apt update && apt install -y libblas64-dev liblapack64-dev
1920
fi

test/runtests.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ function run_test((test_name, test_expected_outputs, test_success), libblas_name
2929
append!(ldflags, ("-Wl,-rpath,$(pathesc(libdir))" for libdir in libdirs))
3030
end
3131

32+
if Sys.islinux()
33+
# Linux needs this for transitive dependencies
34+
append!(ldflags, ("-Wl,-rpath-link,$(pathesc(libdir))" for libdir in libdirs))
35+
end
36+
3237
mktempdir() do dir
3338
@info("Compiling `$(test_name)` against $(libblas_name) ($(backing_libs)) in $(dir)")
3439
srcdir = joinpath(@__DIR__, test_name)

0 commit comments

Comments
 (0)