authorgravatar for ryan.saunderson88@gmail.comdimenus <ryan.saunderson88@gmail.com> 2017-11-03 16:46:43-05:00
committergravatar for ryan.saunderson88@gmail.comdimenus <ryan.saunderson88@gmail.com> 2017-11-03 17:09:35-05:00
log1890760206daa54af6b99ea052bc1d021004245d
tree5dbdfe8d9e3434bf358a0c9eb29cce597ed0aec9
parent795703a39cfe0d59fcd9fff7a605a7efe9c5bdb2

Windows libc & static libc are located in the same dir which is already covered by msvc_lib_dir

1 files changed, 7 insertions(+), 1 deletions(-)

src/analyze.cpp+7-1
...@@ -3440,8 +3440,14 @@ void find_libc_lib_path(CodeGen *g) {...@@ -3440,8 +3440,14 @@ void find_libc_lib_path(CodeGen *g) {
3440 zig_panic("Unable to determine libc lib path.");3440 zig_panic("Unable to determine libc lib path.");
3441 }3441 }
3442 }3442 }
3443
3443 if (!g->libc_static_lib_dir || buf_len(g->libc_static_lib_dir) == 0) {3444 if (!g->libc_static_lib_dir || buf_len(g->libc_static_lib_dir) == 0) {
3444 zig_panic("Unable to determine libc static lib path.");3445 if ((g->zig_target.os == ZigLLVM_Win32) && (g->msvc_lib_dir != NULL)) {
3446 return;
3447 }
3448 else {
3449 zig_panic("Unable to determine libc static lib path.");
3450 }
3445 }3451 }
3446}3452}
34473453