Commit 5280ea5d22687bf4939dd1807c8a711937239307 | zig

author	Al Hoang <3811822-hoanga@users.noreply.gitlab.com> 2021-05-22 01:06:41-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-05-24 10:39:02-07:00
log	5280ea5d22687bf4939dd1807c8a711937239307
tree	4e48d441a7343b49155f0d4b632e7271075a018d
parent	c4a4330cc7a783ad188daedd05159b725128f69c

update compilation and elf link for haiku case

* 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)

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

src
- Compilation.zig
- libc_installation.zig

src/Compilation.zig+7

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

src/libc_installation.zig+29-1

...	...	@@ -21,6 +21,7 @@ pub const LibCInstallation = struct {
21	21	crt_dir: ?[]const u8 = null,
22	22	msvc_lib_dir: ?[]const u8 = null,
23	23	kernel32_lib_dir: ?[]const u8 = null,
	24	crtbegin_dir: ?[]const u8 = null,
24	25
25	26	pub const FindError = error{
26	27	OutOfMemory,
...	...	@@ -113,6 +114,10 @@ pub const LibCInstallation = struct {
113	114	});
114	115	return error.ParseError;
115	116	}
	117	if (self.crtbegin_dir == null and is_haiku) {
	118	log.err("crtbegin_dir may not be empty for {s}\n", .{@tagName(Target.current.os.tag)});
	119	return error.ParseError;
	120	}
116	121
117	122	return self;
118	123	}
...	...	@@ -124,6 +129,7 @@ pub const LibCInstallation = struct {
124	129	const crt_dir = self.crt_dir orelse "";
125	130	const msvc_lib_dir = self.msvc_lib_dir orelse "";
126	131	const kernel32_lib_dir = self.kernel32_lib_dir orelse "";
	132	const crtbegin_dir = self.crtbegin_dir orelse "";
127	133
128	134	try out.print(
129	135	\\# The directory that contains `stdlib.h`.
...	...	@@ -148,12 +154,17 @@ pub const LibCInstallation = struct {
148	154	\\# Only needed when targeting MSVC on Windows.
149	155	\\kernel32_lib_dir={s}
150	156	\\
	157	\\# The directory that contains `crtbeginS.o` and `crtendS.o`
	158	\\# Only needed when targeting Haiku.
	159	\\crtbegin_dir={s}
	160	\\
151	161	, .{
152	162	include_dir,
153	163	sys_include_dir,
154	164	crt_dir,
155	165	msvc_lib_dir,
156	166	kernel32_lib_dir,
	167	crtbegin_dir,
157	168	});
158	169	}
159	170
...	...	@@ -188,6 +199,15 @@ pub const LibCInstallation = struct {
188	199	.NotFound => return error.WindowsSdkNotFound,
189	200	.PathTooLong => return error.WindowsSdkNotFound,
190	201	}
	202	} else if (is_haiku) {
	203	try blk: {
	204	var batch = Batch(FindError!void, 2, .auto_async).init();
	205	errdefer batch.wait() catch {};
	206	batch.add(&async self.findNativeIncludeDirPosix(args));
	207	batch.add(&async self.findNativeCrtBeginDirHaiku(args));
	208	self.crt_dir = try std.mem.dupeZ(args.allocator, u8, "/system/develop/lib");
	209	break :blk batch.wait();
	210	};
191	211	} else {
192	212	try blk: {
193	213	var batch = Batch(FindError!void, 2, .auto_async).init();
...	...	@@ -196,7 +216,6 @@ pub const LibCInstallation = struct {
196	216	switch (Target.current.os.tag) {
197	217	.freebsd, .netbsd, .openbsd, .dragonfly => self.crt_dir = try std.mem.dupeZ(args.allocator, u8, "/usr/lib"),
198	218	.linux => batch.add(&async self.findNativeCrtDirPosix(args)),
199		.haiku => self.crt_dir = try std.mem.dupeZ(args.allocator, u8, "/system/develop/lib"),
200	219	else => {},
201	220	}
202	221	break :blk batch.wait();
...	...	@@ -422,6 +441,15 @@ pub const LibCInstallation = struct {
422	441	});
423	442	}
424	443
	444	fn findNativeCrtBeginDirHaiku(self: *LibCInstallation, args: FindNativeOptions) FindError!void {
	445	self.crtbegin_dir = try ccPrintFileName(.{
	446	.allocator = args.allocator,
	447	.search_basename = "crtbeginS.o",
	448	.want_dirname = .only_dir,
	449	.verbose = args.verbose,
	450	});
	451	}
	452
425	453	fn findNativeKernel32LibDir(
426	454	self: *LibCInstallation,
427	455	args: FindNativeOptions,