Skip to content

Commit 3dd4151

Browse files
committed
[Runner] Move csl_paths(host_platform) at the beginning of LD_LIBRARY_PATH
This should make it easier to run applications we build with our toolchain.
1 parent 86114d6 commit 3dd4151

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Project.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "BinaryBuilderBase"
22
uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
33
authors = ["Elliot Saba <[email protected]>"]
4-
version = "0.6.12"
4+
version = "0.6.13"
55

66
[deps]
77
CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"

src/Runner.jl

+4-4
Original file line numberDiff line numberDiff line change
@@ -927,12 +927,12 @@ function platform_envs(platform::AbstractPlatform, src_name::AbstractString;
927927
), ":"),
928928

929929
"LD_LIBRARY_PATH" => join((
930-
# Start with a default path
931-
"/usr/local/lib64:/usr/local/lib:/usr/lib64:/usr/lib",
930+
# Start with our CSL libraries for all architectures that can natively run within this environment
931+
csl_paths(host_platform),
932+
# Then add default system paths
933+
"/usr/local/lib64:/usr/local/lib:/usr/lib64:/usr/lib",
932934
# Add our loader directories
933935
"/lib64:/lib",
934-
# Add our CSL libraries for all architectures that can natively run within this environment
935-
csl_paths(host_platform),
936936
# Libdir of the host platform, to run programs in `HostBuildDependency`
937937
"$(host_libdir)",
938938
# Add our target/host-specific library directories for compiler support libraries

0 commit comments

Comments
 (0)