motiejus/zig
1
Fork 0
Code Releases Activity

fixups and revert a few things

Browse Source
This commit is contained in:
Andrew Kelley
2020-04-01 11:56:39 -04:00
parent 7eb938c909
commit 553f0e0546
9 changed files with 52 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/codegen.cpp
View File

@@ -9123,17 +9123,20 @@ static void detect_libc(CodeGen *g) {
g->libc_include_dir_len = 0;
g->libc_include_dir_list = heap::c_allocator.allocate<const char *>(dir_count);
g->libc_include_dir_list[g->libc_include_dir_len] = buf_ptr(buf_create_from_mem(g->libc->include_dir, g->libc->include_dir_len));
g->libc_include_dir_list[g->libc_include_dir_len] = buf_ptr(buf_create_from_mem(
g->libc->include_dir, g->libc->include_dir_len));
g->libc_include_dir_len += 1;
if (want_sys_dir) {
g->libc_include_dir_list[g->libc_include_dir_len] = buf_ptr(buf_create_from_mem(g->libc->sys_include_dir, g->libc->sys_include_dir_len));
g->libc_include_dir_list[g->libc_include_dir_len] = buf_ptr(buf_create_from_mem(
g->libc->sys_include_dir, g->libc->sys_include_dir_len));
g->libc_include_dir_len += 1;
}
if (want_um_and_shared_dirs != 0) {
Buf *include_dir_parent = buf_alloc();
os_path_join(buf_create_from_mem(g->libc->include_dir, g->libc->include_dir_len), buf_create_from_str(".."), include_dir_parent);
os_path_join(buf_create_from_mem(g->libc->include_dir, g->libc->include_dir_len),
buf_create_from_str(".."), include_dir_parent);
Buf *buff1 = buf_alloc();
os_path_join(include_dir_parent, buf_create_from_str("um"), buff1);