aboutsummaryrefslogtreecommitdiff
path: root/src/link.cpp
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-03-05 15:54:08 -0500
committerAndrew Kelley <andrew@ziglang.org>2019-03-05 16:00:28 -0500
commit55a0016221e459c49b9f04a4b57ba84be27bba72 (patch)
tree8c7b7eb1e0e6bf6b34d41110d990f5dca6c4f6f4 /src/link.cpp
parent0d10ab0680c8cd0c75bf6f6cc7d4a153ac742db8 (diff)
downloadzig-55a0016221e459c49b9f04a4b57ba84be27bba72.tar.gz
zig-55a0016221e459c49b9f04a4b57ba84be27bba72.zip
dynamic linker path is independent from libc installation
Diffstat (limited to 'src/link.cpp')
-rw-r--r--src/link.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/link.cpp b/src/link.cpp
index f7df0112db..320d1204d2 100644
--- a/src/link.cpp
+++ b/src/link.cpp
@@ -517,14 +517,9 @@ static void construct_linker_job_elf(LinkJob *lj) {
}
if (!g->is_static) {
- if (g->libc != nullptr) {
- assert(buf_len(&g->libc->dynamic_linker_path) != 0);
- lj->args.append("-dynamic-linker");
- lj->args.append(buf_ptr(&g->libc->dynamic_linker_path));
- } else {
- lj->args.append("-dynamic-linker");
- lj->args.append(target_dynamic_linker(g->zig_target));
- }
+ assert(g->dynamic_linker_path != nullptr);
+ lj->args.append("-dynamic-linker");
+ lj->args.append(buf_ptr(g->dynamic_linker_path));
}
}
@@ -545,7 +540,6 @@ static void construct_linker_job_elf(LinkJob *lj) {
lj->args.append(buf_ptr(builtin_a_path));
}
- // sometimes libgcc is missing stuff, so we still build compiler_rt and rely on weak linkage
Buf *compiler_rt_o_path = build_compiler_rt(g);
lj->args.append(buf_ptr(compiler_rt_o_path));
}