mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

link.MachO: fix merge conflict artifact

Browse source 
This happened from cherry-picking bug fixes from master branch.
This commit is contained in:
Andrew Kelley 2022-02-02 22:13:45 -07:00
parent a0cd4c0f32
commit a418c59546
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/link/MachO.zig
View file

@ -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 = .{