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

better error reporting for missing libc on windows 

closes #931
master
Andrew Kelley 2018-04-22 20:54:52 -04:00
parent 371a3ad4bd
commit 1c41f1ca62
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/analyze.cpp
View File

@ -4433,7 +4433,8 @@ void find_libc_lib_path(CodeGen *g) {
if (g->msvc_lib_dir == nullptr) { if (g->msvc_lib_dir == nullptr) {
Buf* vc_lib_dir = buf_alloc(); Buf* vc_lib_dir = buf_alloc();
if (os_get_win32_vcruntime_path(vc_lib_dir, g->zig_target.arch.arch)) { if (os_get_win32_vcruntime_path(vc_lib_dir, g->zig_target.arch.arch)) {
zig_panic("Unable to determine vcruntime path."); fprintf(stderr, "Unable to determine vcruntime path. --msvc-lib-dir");
exit(1);
} }
g->msvc_lib_dir = vc_lib_dir; g->msvc_lib_dir = vc_lib_dir;
} }
@ -4441,7 +4442,8 @@ void find_libc_lib_path(CodeGen *g) {
if (g->libc_lib_dir == nullptr) { if (g->libc_lib_dir == nullptr) {
Buf* ucrt_lib_path = buf_alloc(); Buf* ucrt_lib_path = buf_alloc();
if (os_get_win32_ucrt_lib_path(sdk, ucrt_lib_path, g->zig_target.arch.arch)) { if (os_get_win32_ucrt_lib_path(sdk, ucrt_lib_path, g->zig_target.arch.arch)) {
zig_panic("Unable to determine ucrt path."); fprintf(stderr, "Unable to determine ucrt path. --libc-lib-dir");
exit(1);
} }
g->libc_lib_dir = ucrt_lib_path; g->libc_lib_dir = ucrt_lib_path;
} }
@ -4449,7 +4451,8 @@ void find_libc_lib_path(CodeGen *g) {
if (g->kernel32_lib_dir == nullptr) { if (g->kernel32_lib_dir == nullptr) {
Buf* kern_lib_path = buf_alloc(); Buf* kern_lib_path = buf_alloc();
if (os_get_win32_kern32_path(sdk, kern_lib_path, g->zig_target.arch.arch)) { if (os_get_win32_kern32_path(sdk, kern_lib_path, g->zig_target.arch.arch)) {
zig_panic("Unable to determine kernel32 path."); fprintf(stderr, "Unable to determine kernel32 path. --kernel32-lib-dir");
exit(1);
} }
g->kernel32_lib_dir = kern_lib_path; g->kernel32_lib_dir = kern_lib_path;
} }

3
src/os.cpp
View File

@ -1334,6 +1334,9 @@ com_done:;
int os_get_win32_ucrt_lib_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_ArchType platform_type) { int os_get_win32_ucrt_lib_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_ArchType platform_type) {
#if defined(ZIG_OS_WINDOWS) #if defined(ZIG_OS_WINDOWS)
if (buf_len(sdk->path10) == 0 || buf_len(sdk->version10) == 0) {
return ErrorFileNotFound;
}
buf_resize(output_buf, 0); buf_resize(output_buf, 0);
buf_appendf(output_buf, "%s\\Lib\\%s\\ucrt\\", buf_ptr(&sdk->path10), buf_ptr(&sdk->version10)); buf_appendf(output_buf, "%s\\Lib\\%s\\ucrt\\", buf_ptr(&sdk->path10), buf_ptr(&sdk->version10));
switch (platform_type) { switch (platform_type) {