diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2022-04-16 18:07:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-16 18:07:02 +0200 |
| commit | 8f75823728d247bc11d916b7257d7eebc7be06de (patch) | |
| tree | c75f34334db2fba833ae91f2ae7a52f9cbd546c8 /lib/std/start.zig | |
| parent | a315d51c0a0c8eda2467c5571f9d7e2495274dbd (diff) | |
| parent | 897df18573c951b49fb6421a9e1b711cabfeda67 (diff) | |
| download | zig-8f75823728d247bc11d916b7257d7eebc7be06de.tar.gz zig-8f75823728d247bc11d916b7257d7eebc7be06de.zip | |
Merge pull request #11446 from ziglang/aarch64-macos-llvm
stage2: fix behavior test failures on aarch64-macos (LLVM+native), and other minor fixes
Diffstat (limited to 'lib/std/start.zig')
| -rw-r--r-- | lib/std/start.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/std/start.zig b/lib/std/start.zig index f4a5cbb763..5690337317 100644 --- a/lib/std/start.zig +++ b/lib/std/start.zig @@ -30,8 +30,8 @@ comptime { builtin.zig_backend == .stage2_arm or builtin.zig_backend == .stage2_riscv64 or builtin.zig_backend == .stage2_sparcv9 or - (builtin.zig_backend == .stage2_llvm and native_os != .linux) or - (builtin.zig_backend == .stage2_llvm and native_arch != .x86_64)) + (builtin.zig_backend == .stage2_llvm and native_os != .linux and native_os != .macos) or + (builtin.zig_backend == .stage2_llvm and native_arch != .x86_64 and native_arch != .aarch64)) { if (builtin.output_mode == .Exe) { if ((builtin.link_libc or builtin.object_format == .c) and @hasDecl(root, "main")) { |