Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix -dynamic-linker arg to ld when not overridden

master
Andrew Kelley 2016-02-09 16:55:08 -07:00
parent 5bdcdd1669
commit f45c374664
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/codegen.cpp
View File

@ -33,9 +33,7 @@ CodeGen *codegen_create(Buf *root_source_dir) {
g->is_test_build = false; g->is_test_build = false;
g->root_source_dir = root_source_dir; g->root_source_dir = root_source_dir;
g->error_value_count = 1; g->error_value_count = 1;
if (ZIG_DYNAMIC_LINKER) { g->dynamic_linker = buf_create_from_str(ZIG_DYNAMIC_LINKER);
g->dynamic_linker = buf_create_from_str(ZIG_DYNAMIC_LINKER);
}
g->libc_lib_dir = buf_create_from_str(ZIG_LIBC_LIB_DIR); g->libc_lib_dir = buf_create_from_str(ZIG_LIBC_LIB_DIR);
g->libc_static_lib_dir = buf_create_from_str(ZIG_LIBC_STATIC_LIB_DIR); 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) {
args.append(buf_ptr(g->libc_static_lib_dir)); args.append(buf_ptr(g->libc_static_lib_dir));
} }
if (g->dynamic_linker) { if (g->dynamic_linker && buf_len(g->dynamic_linker) > 0) {
args.append("-dynamic-linker"); args.append("-dynamic-linker");
args.append(buf_ptr(g->dynamic_linker)); args.append(buf_ptr(g->dynamic_linker));
} else { } else {