| author |  Jakub Konka <kubkon@jakubkonka.com> 2024-02-08 22:55:11+01:00 |
| committer | Jakub Konka <kubkon@jakubkonka.com> 2024-02-08 23:51:21+01:00 |
| log | 32386a06caefc78dc3f0a2e6bb2cd478a4615bc3 |
| tree | 1f9a427bdb4875df2f1f1a67ed2028f38f4b35f0 |
| parent | 7fb9df3fab4f8c7acfd73c733a8da752791d4b2a |
builtin: enable panic handler on self-hosted macho
comp: toggle compiler-rt and zig-libc caps for macho2 files changed, 3 insertions(+), 3 deletions(-)
lib- std
lib/std/builtin.zig+1-1
| ... | @@ -765,7 +765,7 @@ pub fn default_panic(msg: []const u8, error_return_trace: ?*StackTrace, ret_addr | ... | @@ -765,7 +765,7 @@ pub fn default_panic(msg: []const u8, error_return_trace: ?*StackTrace, ret_addr |
| 765 | builtin.zig_backend == .stage2_arm or | 765 | builtin.zig_backend == .stage2_arm or |
| 766 | builtin.zig_backend == .stage2_aarch64 or | 766 | builtin.zig_backend == .stage2_aarch64 or |
| 767 | builtin.zig_backend == .stage2_x86 or | 767 | builtin.zig_backend == .stage2_x86 or |
| 768 | (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) or | 768 | (builtin.zig_backend == .stage2_x86_64 and (builtin.target.ofmt != .elf and builtin.target.ofmt != .macho)) or |
| 769 | builtin.zig_backend == .stage2_riscv64 or | 769 | builtin.zig_backend == .stage2_riscv64 or |
| 770 | builtin.zig_backend == .stage2_sparc64 or | 770 | builtin.zig_backend == .stage2_sparc64 or |
| 771 | builtin.zig_backend == .stage2_spirv64) | 771 | builtin.zig_backend == .stage2_spirv64) |
src/Compilation.zig+2-2
| ... | @@ -6280,7 +6280,7 @@ fn canBuildLibCompilerRt(target: std.Target, use_llvm: bool) bool { | ... | @@ -6280,7 +6280,7 @@ fn canBuildLibCompilerRt(target: std.Target, use_llvm: bool) bool { |
| 6280 | } | 6280 | } |
| 6281 | return switch (target_util.zigBackend(target, use_llvm)) { | 6281 | return switch (target_util.zigBackend(target, use_llvm)) { |
| 6282 | .stage2_llvm => true, | 6282 | .stage2_llvm => true, |
| 6283 | .stage2_x86_64 => if (target.ofmt == .elf) true else build_options.have_llvm, | 6283 | .stage2_x86_64 => if (target.ofmt == .elf or target.ofmt == .macho) true else build_options.have_llvm, |
| 6284 | else => build_options.have_llvm, | 6284 | else => build_options.have_llvm, |
| 6285 | }; | 6285 | }; |
| 6286 | } | 6286 | } |
| ... | @@ -6298,7 +6298,7 @@ fn canBuildZigLibC(target: std.Target, use_llvm: bool) bool { | ... | @@ -6298,7 +6298,7 @@ fn canBuildZigLibC(target: std.Target, use_llvm: bool) bool { |
| 6298 | } | 6298 | } |
| 6299 | return switch (target_util.zigBackend(target, use_llvm)) { | 6299 | return switch (target_util.zigBackend(target, use_llvm)) { |
| 6300 | .stage2_llvm => true, | 6300 | .stage2_llvm => true, |
| 6301 | .stage2_x86_64 => if (target.ofmt == .elf) true else build_options.have_llvm, | 6301 | .stage2_x86_64 => if (target.ofmt == .elf or target.ofmt == .macho) true else build_options.have_llvm, |
| 6302 | else => build_options.have_llvm, | 6302 | else => build_options.have_llvm, |
| 6303 | }; | 6303 | }; |
| 6304 | } | 6304 | } |