diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-03-31 12:13:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-31 12:13:30 -0400 |
| commit | 51a6ff18d454f4cb0faa0f1837df9f0c55a80b43 (patch) | |
| tree | bd603e96266978590f4c2d6201829f8817a64f3c /src/target.cpp | |
| parent | 7d66908f294eed1138802c060185721a2e265f3b (diff) | |
| parent | 8f962a957a3645342fba8219cf8f33d0ac42e16d (diff) | |
| download | zig-51a6ff18d454f4cb0faa0f1837df9f0c55a80b43.tar.gz zig-51a6ff18d454f4cb0faa0f1837df9f0c55a80b43.zip | |
Merge pull request #872 from zig-lang/runtime-libc
find libc and zig std lib at runtime
Diffstat (limited to 'src/target.cpp')
| -rw-r--r-- | src/target.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/target.cpp b/src/target.cpp index 8e7c5ce578..5008b51a09 100644 --- a/src/target.cpp +++ b/src/target.cpp @@ -863,6 +863,10 @@ Buf *target_dynamic_linker(ZigTarget *target) { env == ZigLLVM_GNUX32) { return buf_create_from_str("/libx32/ld-linux-x32.so.2"); + } else if (arch == ZigLLVM_x86_64 && + (env == ZigLLVM_Musl || env == ZigLLVM_MuslEABI || env == ZigLLVM_MuslEABIHF)) + { + return buf_create_from_str("/lib/ld-musl-x86_64.so.1"); } else { return buf_create_from_str("/lib64/ld-linux-x86-64.so.2"); } |