From 3f81ddb735bfc8e6fb1776df7407ace213816252 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Sat, 19 Dec 2020 09:59:38 +0100 Subject: macho: address review comments --- src/glibc.zig | 3 --- src/link/MachO.zig | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/glibc.zig b/src/glibc.zig index 0c318a13c7..901054176e 100644 --- a/src/glibc.zig +++ b/src/glibc.zig @@ -553,9 +553,6 @@ fn add_include_dirs(comp: *Compilation, arena: *Allocator, args: *std.ArrayList( try args.append("-I"); try args.append(try lib_path(comp, arena, lib_libc ++ "include" ++ s ++ "any-linux-any")); - - try args.append("-I"); - try args.append(try lib_path(comp, arena, lib_libc ++ "include" ++ s ++ "any-macos-any")); } fn add_include_dirs_arch( diff --git a/src/link/MachO.zig b/src/link/MachO.zig index a80e272935..13704d8839 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -854,8 +854,8 @@ fn linkWithLLD(self: *MachO, comp: *Compilation) !void { try self.writeLoadCommands(); try self.writeHeader(); } - if (self.code_signature_cmd_index == null) { - if (target.cpu.arch != .aarch64) return; // This is currently needed only for aarch64 targets. + if (self.code_signature_cmd_index == null) outer: { + if (target.cpu.arch != .aarch64) break :outer; // This is currently needed only for aarch64 targets. const text_segment = self.load_commands.items[self.text_segment_cmd_index.?].Segment; const text_section = text_segment.sections.items[self.text_section_index.?]; const after_last_cmd_offset = self.header.?.sizeofcmds + @sizeOf(macho.mach_header_64); -- cgit v1.2.3