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...@@ -389,7 +389,7 @@ static Error zig_libc_find_native_msvc_include_dir(ZigLibCInstallation *self, Zi
389 }389 }
390 Buf search_path = BUF_INIT;390 Buf search_path = BUF_INIT;
391 buf_init_from_mem(&search_path, sdk->msvc_lib_dir_ptr, sdk->msvc_lib_dir_len);391 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
394 Buf *vcruntime_path = buf_sprintf("%s\\vcruntime.h", buf_ptr(&search_path));394 Buf *vcruntime_path = buf_sprintf("%s\\vcruntime.h", buf_ptr(&search_path));
395 bool exists;395 bool exists;
src/os.cpp+4-4
...@@ -1554,7 +1554,7 @@ void os_stderr_set_color(TermColor color) {...@@ -1554,7 +1554,7 @@ void os_stderr_set_color(TermColor color) {
1554Error os_get_win32_ucrt_lib_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_ArchType platform_type) {1554Error os_get_win32_ucrt_lib_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_ArchType platform_type) {
1555#if defined(ZIG_OS_WINDOWS)1555#if defined(ZIG_OS_WINDOWS)
1556 buf_resize(output_buf, 0);1556 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);
1558 switch (platform_type) {1558 switch (platform_type) {
1559 case ZigLLVM_x86:1559 case ZigLLVM_x86:
1560 buf_append_str(output_buf, "x86\\");1560 buf_append_str(output_buf, "x86\\");
...@@ -1586,7 +1586,7 @@ Error os_get_win32_ucrt_lib_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_Ar...@@ -1586,7 +1586,7 @@ Error os_get_win32_ucrt_lib_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_Ar
1586Error os_get_win32_ucrt_include_path(ZigWindowsSDK *sdk, Buf* output_buf) {1586Error os_get_win32_ucrt_include_path(ZigWindowsSDK *sdk, Buf* output_buf) {
1587#if defined(ZIG_OS_WINDOWS)1587#if defined(ZIG_OS_WINDOWS)
1588 buf_resize(output_buf, 0);1588 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);
1590 if (GetFileAttributesA(buf_ptr(output_buf)) != INVALID_FILE_ATTRIBUTES) {1590 if (GetFileAttributesA(buf_ptr(output_buf)) != INVALID_FILE_ATTRIBUTES) {
1591 return ErrorNone;1591 return ErrorNone;
1592 }1592 }
...@@ -1603,7 +1603,7 @@ Error os_get_win32_kern32_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_Arch...@@ -1603,7 +1603,7 @@ Error os_get_win32_kern32_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_Arch
1603#if defined(ZIG_OS_WINDOWS)1603#if defined(ZIG_OS_WINDOWS)
1604 {1604 {
1605 buf_resize(output_buf, 0);1605 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);
1607 switch (platform_type) {1607 switch (platform_type) {
1608 case ZigLLVM_x86:1608 case ZigLLVM_x86:
1609 buf_append_str(output_buf, "x86\\");1609 buf_append_str(output_buf, "x86\\");
...@@ -1626,7 +1626,7 @@ Error os_get_win32_kern32_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_Arch...@@ -1626,7 +1626,7 @@ Error os_get_win32_kern32_path(ZigWindowsSDK *sdk, Buf* output_buf, ZigLLVM_Arch
1626 }1626 }
1627 {1627 {
1628 buf_resize(output_buf, 0);1628 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);
1630 switch (platform_type) {1630 switch (platform_type) {
1631 case ZigLLVM_x86:1631 case ZigLLVM_x86:
1632 buf_append_str(output_buf, "x86\\");1632 buf_append_str(output_buf, "x86\\");