authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-09 16:55:08-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-09 16:55:23-07:00
logf45c374664b38dcbf8c65c938863ed10d0dda25a
tree454d31290089693784e2c9f317caa80e41872972
parent5bdcdd1669de05ea4b09e8319186f2792626f003

fix -dynamic-linker arg to ld when not overridden

1 files changed, 2 insertions(+), 4 deletions(-)

src/codegen.cpp+2-4
...@@ -33,9 +33,7 @@ CodeGen *codegen_create(Buf *root_source_dir) {...@@ -33,9 +33,7 @@ CodeGen *codegen_create(Buf *root_source_dir) {
33 g->is_test_build = false;33 g->is_test_build = false;
34 g->root_source_dir = root_source_dir;34 g->root_source_dir = root_source_dir;
35 g->error_value_count = 1;35 g->error_value_count = 1;
36 if (ZIG_DYNAMIC_LINKER) {36 g->dynamic_linker = buf_create_from_str(ZIG_DYNAMIC_LINKER);
37 g->dynamic_linker = buf_create_from_str(ZIG_DYNAMIC_LINKER);
38 }
3937
40 g->libc_lib_dir = buf_create_from_str(ZIG_LIBC_LIB_DIR);38 g->libc_lib_dir = buf_create_from_str(ZIG_LIBC_LIB_DIR);
41 g->libc_static_lib_dir = buf_create_from_str(ZIG_LIBC_STATIC_LIB_DIR);39 g->libc_static_lib_dir = buf_create_from_str(ZIG_LIBC_STATIC_LIB_DIR);
...@@ -4168,7 +4166,7 @@ void codegen_link(CodeGen *g, const char *out_file) {...@@ -4168,7 +4166,7 @@ void codegen_link(CodeGen *g, const char *out_file) {
4168 args.append(buf_ptr(g->libc_static_lib_dir));4166 args.append(buf_ptr(g->libc_static_lib_dir));
4169 }4167 }
41704168
4171 if (g->dynamic_linker) {4169 if (g->dynamic_linker && buf_len(g->dynamic_linker) > 0) {
4172 args.append("-dynamic-linker");4170 args.append("-dynamic-linker");
4173 args.append(buf_ptr(g->dynamic_linker));4171 args.append(buf_ptr(g->dynamic_linker));
4174 } else {4172 } else {