authorgravatar for 3811822-hoanga@users.noreply.gitlab.comAl Hoang <3811822-hoanga@users.noreply.gitlab.com> 2021-10-31 21:22:56-05:00
committergravatar for 3811822-hoanga@users.noreply.gitlab.comAl Hoang <3811822-hoanga@users.noreply.gitlab.com> 2021-11-15 00:29:26-06:00
log406baf4b1283571c7ef28143eb35f2f24238ef3c
tree61b0e0e7c950afb6b0347a6d722d82736e13d489
parentb26b72f54051b89e6fc349f453aafe9f3a3135a5

update compilation includes for haiku

2 files changed, 10 insertions(+), 1 deletions(-)

src/Compilation.zig+9
...@@ -3836,6 +3836,15 @@ fn detectLibCFromLibCInstallation(arena: *Allocator, target: Target, lci: *const...@@ -3836,6 +3836,15 @@ fn detectLibCFromLibCInstallation(arena: *Allocator, target: Target, lci: *const
3836 list.appendAssumeCapacity(shared_dir);3836 list.appendAssumeCapacity(shared_dir);
3837 }3837 }
3838 }3838 }
3839 if (target.os.tag == .haiku) {
3840 const include_dir_path = lci.include_dir orelse return error.LibCInstallationNotAvailable;
3841 const os_dir = try std.fs.path.join(arena, &[_][]const u8{ include_dir_path, "os" });
3842 list.appendAssumeCapacity(os_dir);
3843
3844 const config_dir = try std.fs.path.join(arena, &[_][]const u8{ include_dir_path, "config" });
3845 list.appendAssumeCapacity(config_dir);
3846 }
3847
3839 return LibCDirs{3848 return LibCDirs{
3840 .libc_include_dir_list = list.items,3849 .libc_include_dir_list = list.items,
3841 .libc_installation = lci,3850 .libc_installation = lci,
src/libc_installation.zig+1-1
...@@ -321,7 +321,7 @@ pub const LibCInstallation = struct {...@@ -321,7 +321,7 @@ pub const LibCInstallation = struct {
321 const sys_include_dir_example_file = if (is_windows)321 const sys_include_dir_example_file = if (is_windows)
322 "sys\\types.h"322 "sys\\types.h"
323 else if (is_haiku)323 else if (is_haiku)
324 "posix/errno.h"324 "errno.h"
325 else325 else
326 "sys/errno.h";326 "sys/errno.h";
327327