diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2017-11-03 18:32:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-03 18:32:03 -0400 |
| commit | d4c1ed95acb1c301cd29ee7b452e739df0976dc1 (patch) | |
| tree | 5dbdfe8d9e3434bf358a0c9eb29cce597ed0aec9 /src/analyze.cpp | |
| parent | 795703a39cfe0d59fcd9fff7a605a7efe9c5bdb2 (diff) | |
| parent | 1890760206daa54af6b99ea052bc1d021004245d (diff) | |
| download | zig-d4c1ed95acb1c301cd29ee7b452e739df0976dc1.tar.gz zig-d4c1ed95acb1c301cd29ee7b452e739df0976dc1.zip | |
Merge pull request #583 from Dimenus/libc_runtime
Win32 libc runtime fixes.
Diffstat (limited to 'src/analyze.cpp')
| -rw-r--r-- | src/analyze.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
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."); + } } } |