authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-02-02 22:13:45-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-02-02 22:13:45-07:00
loga418c595464470a74f99f019cf735b6ee778cd3f
tree2316f2fd74496575c2d230749379e5ad84c14582
parenta0cd4c0f327a484879cf5d538bdbfd3392759402

link.MachO: fix merge conflict artifact

This happened from cherry-picking bug fixes from master branch.

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

src/link/MachO.zig+1-1
...@@ -382,7 +382,7 @@ pub fn createEmpty(gpa: Allocator, options: link.Options) !*MachO {...@@ -382,7 +382,7 @@ pub fn createEmpty(gpa: Allocator, options: link.Options) !*MachO {
382 // ABI such as aarch64-ios-simulator, etc.382 // ABI such as aarch64-ios-simulator, etc.
383 const requires_adhoc_codesig = cpu_arch == .aarch64 and (os_tag == .macos or abi == .simulator);383 const requires_adhoc_codesig = cpu_arch == .aarch64 and (os_tag == .macos or abi == .simulator);
384 const use_stage1 = build_options.is_stage1 and options.use_stage1;384 const use_stage1 = build_options.is_stage1 and options.use_stage1;
385 const needs_prealloc = !(use_stage1 or options.cache_mode == .whole);385 const needs_prealloc = !use_stage1;
386386
387 self.* = .{387 self.* = .{
388 .base = .{388 .base = .{