diff options
| author | Josh Wolfe <thejoshwolfe@gmail.com> | 2018-04-10 21:46:13 -0400 |
|---|---|---|
| committer | Josh Wolfe <thejoshwolfe@gmail.com> | 2018-04-10 21:46:13 -0400 |
| commit | b553b7ab83894447d53bcdc1b5a10c7cbcd2281f (patch) | |
| tree | a2614c600dfbf57d7c92cfa8268767b60eb75b91 /src/target.cpp | |
| parent | 0ba85ea6ff910c7a49ae036625b945c475c0f58c (diff) | |
| parent | ee3e2790aa85c624fc952bc8326b82d72843bb17 (diff) | |
| download | zig-b553b7ab83894447d53bcdc1b5a10c7cbcd2281f.tar.gz zig-b553b7ab83894447d53bcdc1b5a10c7cbcd2281f.zip | |
Merge branch 'master' into self-hosted-parser
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"); } |