[Runner] Move host-specific CSL directory forward in LD_LIBRARY_PATH

JuliaPackaging · Jul 11, 2021 · 1bac60a · 1bac60a
1 parent 1bbd393
commit 1bac60a
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/Runner.jl b/src/Runner.jl
@@ -918,16 +918,17 @@ function platform_envs(platform::AbstractPlatform, src_name::AbstractString;
         ), ":"),
 
         "LD_LIBRARY_PATH" => join((
-            # Start with our CSL libraries for all architectures that can natively run within this environment
-            csl_paths(host_platform),
-            # Then add default system paths
-            "/usr/local/lib64:/usr/local/lib:/usr/lib64:/usr/lib",
+            # Start with host-specific library directories for compiler support libraries
+            target_lib_dir(host_platform),
+            # Add system default paths
+           "/usr/local/lib64:/usr/local/lib:/usr/lib64:/usr/lib",
             # Add our loader directories
             "/lib64:/lib",
+            # Add our CSL libraries for all architectures that can natively run within this environment
+            csl_paths(host_platform),
             # Libdir of the host platform, to run programs in `HostBuildDependency`
             "$(host_libdir)",
-            # Add our target/host-specific library directories for compiler support libraries
-            target_lib_dir(host_platform),
+            # Add our target-specific library directories for compiler support libraries
             target_lib_dir(platform),
             # Finally, dependencies
             "$(prefix)/lib64:$(prefix)/lib",