zig

fork of https://codeberg.org/ziglang/zig
Log | Files | Refs | README | LICENSE

commit 291afcf75ab458e54a8ccd78dfd1531debfd2e40 (tree)
parent 27fc49f72c681c0643c2454fe0393abb913703f9
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Tue,  3 Jul 2018 14:20:26 -0400

fix runtime libc detection depending on locale

closes #1165

Diffstat:
Msrc/analyze.cpp | 12++----------
1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/analyze.cpp b/src/analyze.cpp @@ -4417,22 +4417,14 @@ Buf *get_linux_libc_include_path(void) { } char *prev_newline = buf_ptr(out_stderr); ZigList<const char *> search_paths = {}; - bool found_search_paths = false; for (;;) { char *newline = strchr(prev_newline, '\n'); if (newline == nullptr) { - zig_panic("unable to determine libc include path: bad output from C compiler command"); + break; } *newline = 0; - if (found_search_paths) { - if (strcmp(prev_newline, "End of search list.") == 0) { - break; - } + if (prev_newline[0] == ' ') { search_paths.append(prev_newline); - } else { - if (strcmp(prev_newline, "#include <...> search starts here:") == 0) { - found_search_paths = true; - } } prev_newline = newline + 1; }