authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-12-19 09:59:38+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-12-19 09:59:38+01:00
log3f81ddb735bfc8e6fb1776df7407ace213816252
tree85c12e78673afa3de60b7921f950ac7263596666
parentb42ef0e6ea0fed8e592e474bd09e070e10fca920

macho: address review comments

2 files changed, 2 insertions(+), 5 deletions(-)

src/glibc.zig-3
...@@ -553,9 +553,6 @@ fn add_include_dirs(comp: *Compilation, arena: *Allocator, args: *std.ArrayList(...@@ -553,9 +553,6 @@ fn add_include_dirs(comp: *Compilation, arena: *Allocator, args: *std.ArrayList(
553553
554 try args.append("-I");554 try args.append("-I");
555 try args.append(try lib_path(comp, arena, lib_libc ++ "include" ++ s ++ "any-linux-any"));555 try args.append(try lib_path(comp, arena, lib_libc ++ "include" ++ s ++ "any-linux-any"));
556
557 try args.append("-I");
558 try args.append(try lib_path(comp, arena, lib_libc ++ "include" ++ s ++ "any-macos-any"));
559}556}
560557
561fn add_include_dirs_arch(558fn add_include_dirs_arch(
src/link/MachO.zig+2-2
...@@ -854,8 +854,8 @@ fn linkWithLLD(self: *MachO, comp: *Compilation) !void {...@@ -854,8 +854,8 @@ fn linkWithLLD(self: *MachO, comp: *Compilation) !void {
854 try self.writeLoadCommands();854 try self.writeLoadCommands();
855 try self.writeHeader();855 try self.writeHeader();
856 }856 }
857 if (self.code_signature_cmd_index == null) {857 if (self.code_signature_cmd_index == null) outer: {
858 if (target.cpu.arch != .aarch64) return; // This is currently needed only for aarch64 targets.858 if (target.cpu.arch != .aarch64) break :outer; // This is currently needed only for aarch64 targets.
859 const text_segment = self.load_commands.items[self.text_segment_cmd_index.?].Segment;859 const text_segment = self.load_commands.items[self.text_segment_cmd_index.?].Segment;
860 const text_section = text_segment.sections.items[self.text_section_index.?];860 const text_section = text_segment.sections.items[self.text_section_index.?];
861 const after_last_cmd_offset = self.header.?.sizeofcmds + @sizeOf(macho.mach_header_64);861 const after_last_cmd_offset = self.header.?.sizeofcmds + @sizeOf(macho.mach_header_64);