Skip to content

Commit 6fbeabe

Browse files
committed
Add CSL libraries to support running glibc binaries even when we're not targeting them.
1 parent ed30256 commit 6fbeabe

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/Runner.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -699,10 +699,12 @@ function platform_envs(platform::Platform, src_name::AbstractString; host_platfo
699699
), ":"),
700700

701701
"LD_LIBRARY_PATH" => join((
702-
# Start with the default musl ld path
703-
"/usr/local/lib64:/usr/local/lib:/usr/local/lib:/usr/lib",
702+
# Start with a default path
703+
"/usr/local/lib64:/usr/local/lib:/usr/lib64:/usr/lib",
704704
# Add our loader directories
705705
"/lib64:/lib",
706+
# Add our CSL libraries for all architectures that can natively run within this environment
707+
join(["/usr/lib/csl-$(libc)-$(arch)" for libc in ("glibc", "musl"), arch in ("x86_64", "i686")], ":"),
706708
# Add our target/host-specific library directories for compiler support libraries
707709
target_lib_dir(host_platform),
708710
target_lib_dir(rust_host),

0 commit comments

Comments
 (0)