From a418c595464470a74f99f019cf735b6ee778cd3f Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 2 Feb 2022 22:13:45 -0700 Subject: [PATCH] link.MachO: fix merge conflict artifact This happened from cherry-picking bug fixes from master branch. --- src/link/MachO.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/link/MachO.zig b/src/link/MachO.zig index b27c54fd34..033d9ea6f7 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -382,7 +382,7 @@ pub fn createEmpty(gpa: Allocator, options: link.Options) !*MachO { // ABI such as aarch64-ios-simulator, etc. const requires_adhoc_codesig = cpu_arch == .aarch64 and (os_tag == .macos or abi == .simulator); const use_stage1 = build_options.is_stage1 and options.use_stage1; - const needs_prealloc = !(use_stage1 or options.cache_mode == .whole); + const needs_prealloc = !use_stage1; self.* = .{ .base = .{