From 1890760206daa54af6b99ea052bc1d021004245d Mon Sep 17 00:00:00 2001 From: dimenus Date: Fri, 3 Nov 2017 16:46:43 -0500 Subject: [PATCH] Windows libc & static libc are located in the same dir which is already covered by msvc_lib_dir --- src/analyze.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/analyze.cpp b/src/analyze.cpp index 4258a4d7d6..0a408f44ff 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -3440,8 +3440,14 @@ void find_libc_lib_path(CodeGen *g) { zig_panic("Unable to determine libc lib path."); } } + if (!g->libc_static_lib_dir || buf_len(g->libc_static_lib_dir) == 0) { - zig_panic("Unable to determine libc static lib path."); + if ((g->zig_target.os == ZigLLVM_Win32) && (g->msvc_lib_dir != NULL)) { + return; + } + else { + zig_panic("Unable to determine libc static lib path."); + } } }