Skip to content

Commit 2f9264e

Browse files
committed
[Runner] Move host-specific CSL directory forward in LD_LIBRARY_PATH
1 parent 1bbd393 commit 2f9264e

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/Runner.jl

+7-6
Original file line numberDiff line numberDiff line change
@@ -918,16 +918,17 @@ function platform_envs(platform::AbstractPlatform, src_name::AbstractString;
918918
), ":"),
919919

920920
"LD_LIBRARY_PATH" => join((
921-
# Start with our CSL libraries for all architectures that can natively run within this environment
922-
csl_paths(host_platform),
923-
# Then add default system paths
924-
"/usr/local/lib64:/usr/local/lib:/usr/lib64:/usr/lib",
921+
# Start with host-specific library directories for compiler support libraries
922+
target_lib_dir(host_platform),
923+
# Start with a default path
924+
"/usr/local/lib64:/usr/local/lib:/usr/lib64:/usr/lib",
925925
# Add our loader directories
926926
"/lib64:/lib",
927+
# Add our CSL libraries for all architectures that can natively run within this environment
928+
csl_paths(host_platform),
927929
# Libdir of the host platform, to run programs in `HostBuildDependency`
928930
"$(host_libdir)",
929-
# Add our target/host-specific library directories for compiler support libraries
930-
target_lib_dir(host_platform),
931+
# Add our target-specific library directories for compiler support libraries
931932
target_lib_dir(platform),
932933
# Finally, dependencies
933934
"$(prefix)/lib64:$(prefix)/lib",

0 commit comments

Comments
 (0)