Commit 67f11190d10caac1d08b76d60ec28eb2f5173946 | zig

author	Andrew Kelley <andrew@ziglang.org> 2018-03-31 16:34:55-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2018-03-31 16:34:55-04:00
log	67f11190d10caac1d08b76d60ec28eb2f5173946
tree	b276a0ae24321fd17e9dd5f99754dbf8b4c5a359
parent	eb6ff796c17b50969a8f0171ba089f31667b7278

musl-friendly dynamic linking

2 files changed, 40 insertions(+), 22 deletions(-)

build.zig
src
- link.cpp

build.zig+5

 @@ -45,6 +45,11 @@ pub fn build(b: &Builder) !void {
     var exe = b.addExecutable("zig", "src-self-hosted/main.zig");
     exe.setBuildMode(mode);
+    // This is for finding /lib/libz.a on alpine linux.
+    // TODO turn this into -Dextra-lib-path=/lib option
+    exe.addLibPath("/lib");
     exe.addIncludeDir("src");
     exe.addIncludeDir(cmake_binary_dir);
     addCppLib(b, exe, cmake_binary_dir, "zig_cpp");

src/link.cpp+35-22

 @@ -164,32 +164,45 @@ static void add_rpath(LinkJob *lj, Buf *rpath) {
     lj->rpath_table.put(rpath, true);
 }
+static Buf *try_dynamic_linker_path(const char *ld_name) {
+    const char *cc_exe = getenv("CC");
+    cc_exe = (cc_exe == nullptr) ? "cc" : cc_exe;
+    ZigList<const char *> args = {};
+    args.append(buf_ptr(buf_sprintf("-print-file-name=%s", ld_name)));
+    Termination term;
+    Buf *out_stderr = buf_alloc();
+    Buf *out_stdout = buf_alloc();
+    int err;
+    if ((err = os_exec_process(cc_exe, args, &term, out_stderr, out_stdout))) {
+        return nullptr;
+    }
+    if (term.how != TerminationIdClean || term.code != 0) {
+        return nullptr;
+    }
+    if (buf_ends_with_str(out_stdout, "\n")) {
+        buf_resize(out_stdout, buf_len(out_stdout) - 1);
+    }
+    if (buf_len(out_stdout) == 0 || buf_eql_str(out_stdout, ld_name)) {
+        return nullptr;
+    }
+    return out_stdout;
+}
 static Buf *get_dynamic_linker_path(CodeGen *g) {
     if (g->is_native_target && g->zig_target.arch.arch == ZigLLVM_x86_64) {
-        const char *cc_exe = getenv("CC");
+        static const char *ld_names[] = {
-        cc_exe = (cc_exe == nullptr) ? "cc" : cc_exe;
+            "ld-linux-x86-64.so.2",
-        ZigList<const char *> args = {};
+            "ld-musl-x86_64.so.1",
-        args.append("-print-file-name=ld-linux-x86-64.so.2");
+        };
-        Termination term;
+        for (size_t i = 0; i < array_length(ld_names); i += 1) {
-        Buf *out_stderr = buf_alloc();
+            const char *ld_name = ld_names[i];
-        Buf *out_stdout = buf_alloc();
+            Buf *result = try_dynamic_linker_path(ld_name);
-        int err;
+            if (result != nullptr) {
-        if ((err = os_exec_process(cc_exe, args, &term, out_stderr, out_stdout))) {
+                return result;
-            return target_dynamic_linker(&g->zig_target);
+            }
-        }
-        if (term.how != TerminationIdClean || term.code != 0) {
-            return target_dynamic_linker(&g->zig_target);
-        }
-        if (buf_ends_with_str(out_stdout, "\n")) {
-            buf_resize(out_stdout, buf_len(out_stdout) - 1);
-        }
-        if (buf_len(out_stdout) == 0 || buf_eql_str(out_stdout, "ld-linux-x86-64.so.2")) {
-            return target_dynamic_linker(&g->zig_target);
         }
-        return out_stdout;
-    } else {
-        return target_dynamic_linker(&g->zig_target);
     }
+    return target_dynamic_linker(&g->zig_target);
 }
 static void construct_linker_job_elf(LinkJob *lj) {