diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-03-27 13:11:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-27 13:11:01 -0400 |
| commit | fbe9233aa7a84a1c382f35510e71f06d597e2a19 (patch) | |
| tree | c5373e65b70a3ec9ec4d4c3cdeeaed5ae70d9e4b /src/compiler.cpp | |
| parent | cf4e9a27c5a0f370197837312307f40bb1d6685f (diff) | |
| parent | 084724c689215fe3a647ceb9d8622faeb60da1ba (diff) | |
| download | zig-fbe9233aa7a84a1c382f35510e71f06d597e2a19.tar.gz zig-fbe9233aa7a84a1c382f35510e71f06d597e2a19.zip | |
Merge pull request #2107 from shawnl/arm64
fix build on arm64
Diffstat (limited to 'src/compiler.cpp')
| -rw-r--r-- | src/compiler.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/compiler.cpp b/src/compiler.cpp index 7ec1485fad..af62173db7 100644 --- a/src/compiler.cpp +++ b/src/compiler.cpp @@ -26,11 +26,12 @@ Buf *get_stage1_cache_path(void) { } static void detect_dynamic_linker(Buf *lib_path) { -#if defined(ZIG_OS_LINUX) && defined(ZIG_ARCH_X86_64) - if (buf_ends_with_str(lib_path, "ld-linux-x86-64.so.2")) { - buf_init_from_buf(&saved_dynamic_linker_path, lib_path); - } else if (buf_ends_with_str(lib_path, "ld-musl-x86-64.so.1")) { - buf_init_from_buf(&saved_dynamic_linker_path, lib_path); +#if defined(ZIG_OS_LINUX) + for (size_t i = 0; possible_ld_names[i] != NULL; i += 1) { + if (buf_ends_with_str(lib_path, possible_ld_names[i])) { + buf_init_from_buf(&saved_dynamic_linker_path, lib_path); + break; + } } #endif } |