authorgravatar for ypsvlq@gmail.comElaine Gibson <ypsvlq@gmail.com> 2026-05-07 09:25:08+01:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-05-07 21:45:59+02:00
loga85a29ae4d3f646f3d5a8e11bd74e9b0fea4c988
tree214ad9b48c7b2bbbf1c0c97f6bef1cbf3d60a21d
parent989b6a1b93e0a8be6b519c4b7fae4d0e41f26b60

std.zig.LibCDirs: add default haiku include directories

1 files changed, 15 insertions(+), 6 deletions(-)

lib/std/zig/LibCDirs.zig+15-6
...@@ -132,14 +132,23 @@ fn detectFromInstallation(arena: Allocator, target: *const std.Target, lci: *con...@@ -132,14 +132,23 @@ fn detectFromInstallation(arena: Allocator, target: *const std.Target, lci: *con
132 }132 }
133 if (target.os.tag == .haiku) {133 if (target.os.tag == .haiku) {
134 const include_dir_path = lci.include_dir.?;134 const include_dir_path = lci.include_dir.?;
135 const os_dir = try std.fs.path.join(arena, &[_][]const u8{ include_dir_path, "os" });135
136 list.appendAssumeCapacity(os_dir);136 const subdirs = &[_][]const u8{
137 // Errors.h137 "os", "os/app", "os/device", "os/drivers",
138 const os_support_dir = try std.fs.path.join(arena, &[_][]const u8{ include_dir_path, "os/support" });138 "os/game", "os/interface", "os/kernel", "os/locale",
139 list.appendAssumeCapacity(os_support_dir);139 "os/mail", "os/media", "os/midi", "os/midi2",
140 "os/net", "os/opengl", "os/storage", "os/support",
141 "os/translation", "os/add-ons/graphics", "os/add-ons/input_server", "os/add-ons/mail_daemon",
142 "os/add-ons/registrar", "os/add-ons/screen_saver", "os/add-ons/tracker", "os/be_apps/NetPositive",
143 "os/be_apps/Tracker", "bsd", "glibc", "gnu",
144 };
145 for (subdirs) |subdir| {
146 const path = try std.fs.path.join(arena, &[_][]const u8{ include_dir_path, subdir });
147 try list.append(path);
148 }
140149
141 const config_dir = try std.fs.path.join(arena, &[_][]const u8{ include_dir_path, "config" });150 const config_dir = try std.fs.path.join(arena, &[_][]const u8{ include_dir_path, "config" });
142 list.appendAssumeCapacity(config_dir);151 try list.append(config_dir);
143 }152 }
144153
145 var sysroot: ?[]const u8 = null;154 var sysroot: ?[]const u8 = null;