diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-01-03 20:53:53 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-01-03 20:53:53 -0500 |
| commit | 8eae4a096752b7e477d16ee0c5fd40d8871e973a (patch) | |
| tree | 3cdbfaeb3c53eaf551ab59bd508edbb4c2bddc5d /src/link.cpp | |
| parent | 1d77f8db289e6eefce827fe37d27e72b68362943 (diff) | |
| parent | 5a800db48cde943a7fd80fdbfb42bc69a325ca76 (diff) | |
| download | zig-8eae4a096752b7e477d16ee0c5fd40d8871e973a.tar.gz zig-8eae4a096752b7e477d16ee0c5fd40d8871e973a.zip | |
Merge branch 'master' into llvm6
Diffstat (limited to 'src/link.cpp')
| -rw-r--r-- | src/link.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/link.cpp b/src/link.cpp index f07364e5bc..13e61dd4e7 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -426,8 +426,7 @@ static void construct_linker_job_coff(LinkJob *lj) { if (g->is_static) { Buf *cmt_lib_name = buf_sprintf("libcmt%s.lib", d_str); lj->args.append(buf_ptr(cmt_lib_name)); - } - else { + } else { Buf *msvcrt_lib_name = buf_sprintf("msvcrt%s.lib", d_str); lj->args.append(buf_ptr(msvcrt_lib_name)); } @@ -452,6 +451,9 @@ static void construct_linker_job_coff(LinkJob *lj) { // } //} //lj->args.append(get_libc_static_file(g, "crtbegin.o")); + + // msvcrt depends on kernel32 + lj->args.append("kernel32.lib"); } else { lj->args.append("-NODEFAULTLIB"); if (!is_library) { |