authorgravatar for sahnvour@pm.meSahnvour <sahnvour@pm.me> 2019-11-23 16:44:33+01:00
committergravatar for sahnvour@pm.meSahnvour <sahnvour@pm.me> 2019-11-24 21:33:58+01:00
log6ebd26f3dbaf54230f24118043fe91d1f09f9e8e
tree6ae85a52fc73b6677700a1a646ea21cb3aa1cc64
parent696567d9d7870e5bf640186193fe0b7fbccdb6b6

removed unnecessary backslashes in windows' libc paths

2 files changed, 5 insertions(+), 5 deletions(-)

src/libc_installation.cpp+1-1
......@@ -389,7 +389,7 @@ static Error zig_libc_find_native_msvc_include_dir(ZigLibCInstallation *self, Zi
389389 }
390390 Buf search_path = BUF_INIT;
391391 buf_init_from_mem(&search_path, sdk->msvc_lib_dir_ptr, sdk->msvc_lib_dir_len);
392 buf_append_str(&search_path, "\\..\\..\\include");
392 buf_append_str(&search_path, "..\\..\\include");
393393
394394 Buf *vcruntime_path = buf_sprintf("%s\\vcruntime.h", buf_ptr(&search_path));
395395 bool exists;
src/os.cpp+4-4
......@@ -1554,7 +1554,7 @@ void os_stderr_set_color(TermColor color) {
15541554Error os_get_win32_ucrt_lib_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_ArchType platform_type) {
15551555#if defined(ZIG_OS_WINDOWS)
15561556 buf_resize(output_buf, 0);
1557 buf_appendf(output_buf, "%s\\Lib\\%s\\ucrt\\", sdk->path10_ptr, sdk->version10_ptr);
1557 buf_appendf(output_buf, "%sLib\\%s\\ucrt\\", sdk->path10_ptr, sdk->version10_ptr);
15581558 switch (platform_type) {
15591559 case ZigLLVM_x86:
15601560 buf_append_str(output_buf, "x86\\");
......@@ -1586,7 +1586,7 @@ Error os_get_win32_ucrt_lib_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_Ar
15861586Error os_get_win32_ucrt_include_path(ZigWindowsSDK *sdk, Buf* output_buf) {
15871587#if defined(ZIG_OS_WINDOWS)
15881588 buf_resize(output_buf, 0);
1589 buf_appendf(output_buf, "%s\\Include\\%s\\ucrt", sdk->path10_ptr, sdk->version10_ptr);
1589 buf_appendf(output_buf, "%sInclude\\%s\\ucrt", sdk->path10_ptr, sdk->version10_ptr);
15901590 if (GetFileAttributesA(buf_ptr(output_buf)) != INVALID_FILE_ATTRIBUTES) {
15911591 return ErrorNone;
15921592 }
......@@ -1603,7 +1603,7 @@ Error os_get_win32_kern32_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_Arch
16031603#if defined(ZIG_OS_WINDOWS)
16041604 {
16051605 buf_resize(output_buf, 0);
1606 buf_appendf(output_buf, "%s\\Lib\\%s\\um\\", sdk->path10_ptr, sdk->version10_ptr);
1606 buf_appendf(output_buf, "%sLib\\%s\\um\\", sdk->path10_ptr, sdk->version10_ptr);
16071607 switch (platform_type) {
16081608 case ZigLLVM_x86:
16091609 buf_append_str(output_buf, "x86\\");
......@@ -1626,7 +1626,7 @@ Error os_get_win32_kern32_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_Arch
16261626 }
16271627 {
16281628 buf_resize(output_buf, 0);
1629 buf_appendf(output_buf, "%s\\Lib\\%s\\um\\", sdk->path81_ptr, sdk->version81_ptr);
1629 buf_appendf(output_buf, "%sLib\\%s\\um\\", sdk->path81_ptr, sdk->version81_ptr);
16301630 switch (platform_type) {
16311631 case ZigLLVM_x86:
16321632 buf_append_str(output_buf, "x86\\");