mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-26 16:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

update compilation and elf link for haiku case

Browse Source 
* for some reason part of the linkable bits for the crt libraries
  are split in different locations for haiku. this changeset
  accomodates this situation (crtbegin_dir lookup)
This commit is contained in:
Al Hoang 2021-05-22 01:06:41 -05:00 committed by Andrew Kelley
parent c4a4330cc7
commit 5280ea5d22
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Compilation.zig
View File

@ -3286,6 +3286,13 @@ pub fn get_libc_crt_file(comp: *Compilation, arena: *Allocator, basename: []cons
return full_path;
}
pub fn get_libc_crtbegin_file(comp: *Compilation, arena: *Allocator, basename: []const u8) ![]const u8 {
const lci = comp.bin_file.options.libc_installation orelse return error.LibCInstallationNotAvailable;
const crtbegin_dir_path = lci.crtbegin_dir orelse return error.LibCInstallationMissingCRTDir;
const full_path = try std.fs.path.join(arena, &[_][]const u8{ crtbegin_dir_path, basename });
return full_path;
}
fn addBuildingGLibCJobs(comp: *Compilation) !void {
try comp.work_queue.write(&[_]Job{
.{ .glibc_crt_file = .crti_o },

30
src/libc_installation.zig
View File

@ -21,6 +21,7 @@ pub const LibCInstallation = struct {
crt_dir: ?[]const u8 = null,
msvc_lib_dir: ?[]const u8 = null,
kernel32_lib_dir: ?[]const u8 = null,
crtbegin_dir: ?[]const u8 = null,
pub const FindError = error{
OutOfMemory,
@ -113,6 +114,10 @@ pub const LibCInstallation = struct {
});
return error.ParseError;
}
if (self.crtbegin_dir == null and is_haiku) {
log.err("crtbegin_dir may not be empty for {s}\n", .{@tagName(Target.current.os.tag)});
return error.ParseError;
}
return self;
}
@ -124,6 +129,7 @@ pub const LibCInstallation = struct {
const crt_dir = self.crt_dir orelse "";
const msvc_lib_dir = self.msvc_lib_dir orelse "";
const kernel32_lib_dir = self.kernel32_lib_dir orelse "";
const crtbegin_dir = self.crtbegin_dir orelse "";
try out.print(
\\# The directory that contains `stdlib.h`.
@ -148,12 +154,17 @@ pub const LibCInstallation = struct {
\\# Only needed when targeting MSVC on Windows.
\\kernel32_lib_dir={s}
\\
\\# The directory that contains `crtbeginS.o` and `crtendS.o`
\\# Only needed when targeting Haiku.
\\crtbegin_dir={s}
\\
, .{
include_dir,
sys_include_dir,
crt_dir,
msvc_lib_dir,
kernel32_lib_dir,
crtbegin_dir,
});
}
@ -188,6 +199,15 @@ pub const LibCInstallation = struct {
.NotFound => return error.WindowsSdkNotFound,
.PathTooLong => return error.WindowsSdkNotFound,
}
} else if (is_haiku) {
try blk: {
var batch = Batch(FindError!void, 2, .auto_async).init();
errdefer batch.wait() catch {};
batch.add(&async self.findNativeIncludeDirPosix(args));
batch.add(&async self.findNativeCrtBeginDirHaiku(args));
self.crt_dir = try std.mem.dupeZ(args.allocator, u8, "/system/develop/lib");
break :blk batch.wait();
};
} else {
try blk: {
var batch = Batch(FindError!void, 2, .auto_async).init();
@ -196,7 +216,6 @@ pub const LibCInstallation = struct {
switch (Target.current.os.tag) {
.freebsd, .netbsd, .openbsd, .dragonfly => self.crt_dir = try std.mem.dupeZ(args.allocator, u8, "/usr/lib"),
.linux => batch.add(&async self.findNativeCrtDirPosix(args)),
.haiku => self.crt_dir = try std.mem.dupeZ(args.allocator, u8, "/system/develop/lib"),
else => {},
}
break :blk batch.wait();
@ -422,6 +441,15 @@ pub const LibCInstallation = struct {
});
}
fn findNativeCrtBeginDirHaiku(self: *LibCInstallation, args: FindNativeOptions) FindError!void {
self.crtbegin_dir = try ccPrintFileName(.{
.allocator = args.allocator,
.search_basename = "crtbeginS.o",
.want_dirname = .only_dir,
.verbose = args.verbose,
});
}
fn findNativeKernel32LibDir(
self: *LibCInstallation,
args: FindNativeOptions,