diff options
| -rw-r--r-- | lib/std/builtin.zig | 2 | ||||
| -rw-r--r-- | src/Compilation.zig | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/std/builtin.zig b/lib/std/builtin.zig index a0fbaea7de..a6d2ae6a2f 100644 --- a/lib/std/builtin.zig +++ b/lib/std/builtin.zig @@ -765,7 +765,7 @@ pub fn default_panic(msg: []const u8, error_return_trace: ?*StackTrace, ret_addr builtin.zig_backend == .stage2_arm or builtin.zig_backend == .stage2_aarch64 or builtin.zig_backend == .stage2_x86 or - (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) or + (builtin.zig_backend == .stage2_x86_64 and (builtin.target.ofmt != .elf and builtin.target.ofmt != .macho)) or builtin.zig_backend == .stage2_riscv64 or builtin.zig_backend == .stage2_sparc64 or builtin.zig_backend == .stage2_spirv64) diff --git a/src/Compilation.zig b/src/Compilation.zig index d2ed241960..ee2100fedd 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -6280,7 +6280,7 @@ fn canBuildLibCompilerRt(target: std.Target, use_llvm: bool) bool { } return switch (target_util.zigBackend(target, use_llvm)) { .stage2_llvm => true, - .stage2_x86_64 => if (target.ofmt == .elf) true else build_options.have_llvm, + .stage2_x86_64 => if (target.ofmt == .elf or target.ofmt == .macho) true else build_options.have_llvm, else => build_options.have_llvm, }; } @@ -6298,7 +6298,7 @@ fn canBuildZigLibC(target: std.Target, use_llvm: bool) bool { } return switch (target_util.zigBackend(target, use_llvm)) { .stage2_llvm => true, - .stage2_x86_64 => if (target.ofmt == .elf) true else build_options.have_llvm, + .stage2_x86_64 => if (target.ofmt == .elf or target.ofmt == .macho) true else build_options.have_llvm, else => build_options.have_llvm, }; } |