authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-10-10 00:32:28+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-10-16 19:33:05+02:00
log871591ca1c4983448be8ab96f64dbd56b3c5b0e5
treefab7c7d435ea2629e44668ff0b9eea2bf7e66931
parentb3f40c35dc0bc4a09124918da3651bbae823b4a6

elf: fix conflicts after rebase gone bad

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

src/link/Elf.zig+1-1
...@@ -279,7 +279,7 @@ pub fn openPath(allocator: Allocator, sub_path: []const u8, options: link.Option...@@ -279,7 +279,7 @@ pub fn openPath(allocator: Allocator, sub_path: []const u8, options: link.Option
279 const index = @as(File.Index, @intCast(try self.files.addOne(allocator)));279 const index = @as(File.Index, @intCast(try self.files.addOne(allocator)));
280 self.files.set(index, .{ .zig_module = .{280 self.files.set(index, .{ .zig_module = .{
281 .index = index,281 .index = index,
282 .path = options.module.?.main_pkg.root_src_path,282 .path = options.module.?.main_mod.root_src_path,
283 } });283 } });
284 self.zig_module_index = index;284 self.zig_module_index = index;
285 const zig_module = self.file(index).?.zig_module;285 const zig_module = self.file(index).?.zig_module;