From 5d2780246cdf480030b2881a067e627c37bfc78b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matheus=20Catarino=20Fran=C3=A7a?= Date: Mon, 18 Dec 2023 11:31:36 -0300 Subject: [PATCH] CI: fix macos build --- build.zig | 3 ++- scripts/zcc.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.zig b/build.zig index b3fe8dd..aebb5b2 100644 --- a/build.zig +++ b/build.zig @@ -219,7 +219,8 @@ pub fn build(b: *Builder) !void { // "-w", // warnings as error "--wo", // warning of deprecated features }, - .zig_cc = true, // use zig as cc and linker + // fixme: target name conflics (arch-macos-none != arch-apple-macos) + .zig_cc = if (builtin.os.tag == .macos) false else true, // use zig as cc and linker }); ldc.setName("ldc2"); ldc.step.dependOn(b.getInstallStep()); diff --git a/scripts/zcc.sh b/scripts/zcc.sh index 5123ec0..a41b6e3 100755 --- a/scripts/zcc.sh +++ b/scripts/zcc.sh @@ -21,4 +21,5 @@ for arg in "$@"; do fi done +# ldc2 need libunwind for exception zig cc -lunwind "${ARGS[@]}" \ No newline at end of file