diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2020-12-19 09:59:38 +0100 |
|---|---|---|
| committer | Jakub Konka <kubkon@jakubkonka.com> | 2020-12-19 09:59:38 +0100 |
| commit | 3f81ddb735bfc8e6fb1776df7407ace213816252 (patch) | |
| tree | 85c12e78673afa3de60b7921f950ac7263596666 | |
| parent | b42ef0e6ea0fed8e592e474bd09e070e10fca920 (diff) | |
| download | zig-3f81ddb735bfc8e6fb1776df7407ace213816252.tar.gz zig-3f81ddb735bfc8e6fb1776df7407ace213816252.zip | |
macho: address review comments
| -rw-r--r-- | src/glibc.zig | 3 | ||||
| -rw-r--r-- | src/link/MachO.zig | 4 |
2 files changed, 2 insertions, 5 deletions
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); |
