Commit 3f81ddb735

Jakub Konka <kubkon@jakubkonka.com>
2020-12-19 09:59:38
macho: address review comments
1 parent b42ef0e
Changed files (2)
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);
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(