diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2024-02-08 22:55:11 +0100 |
|---|---|---|
| committer | Jakub Konka <kubkon@jakubkonka.com> | 2024-02-08 23:51:21 +0100 |
| commit | 32386a06caefc78dc3f0a2e6bb2cd478a4615bc3 (patch) | |
| tree | 1f9a427bdb4875df2f1f1a67ed2028f38f4b35f0 | |
| parent | 7fb9df3fab4f8c7acfd73c733a8da752791d4b2a (diff) | |
| download | zig-32386a06caefc78dc3f0a2e6bb2cd478a4615bc3.tar.gz zig-32386a06caefc78dc3f0a2e6bb2cd478a4615bc3.zip | |
builtin: enable panic handler on self-hosted macho
comp: toggle compiler-rt and zig-libc caps for macho
| -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, }; } |