From 9c4b6198cd8d156d5029010dd8187db76a7e0942 Mon Sep 17 00:00:00 2001 From: Bob Farrell Date: Sun, 2 Mar 2025 13:49:54 +0000 Subject: [PATCH] Use llvm on MacOS Experimental feature currently only tested with Linux, builds failing for Mac. --- build.zig | 7 +++++-- cli/build.zig.zon | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build.zig b/build.zig index 09e1433..9e18463 100644 --- a/build.zig +++ b/build.zig @@ -5,6 +5,9 @@ pub const GenerateMimeTypes = @import("src/GenerateMimeTypes.zig"); const zmpl_build = @import("zmpl"); const Environment = enum { development, testing, production }; +const builtin = @import("builtin"); + +const use_llvm_default = builtin.os.tag == .macos; pub fn build(b: *std.Build) !void { const target = b.standardTargetOptions(.{}); @@ -36,7 +39,7 @@ pub fn build(b: *std.Build) !void { .{ .target = target, .optimize = optimize, - .use_llvm = b.option(bool, "use_llvm", "Use LLVM") orelse false, + .use_llvm = b.option(bool, "use_llvm", "Use LLVM") orelse use_llvm_default, .zmpl_templates_paths = templates_paths, .zmpl_auto_build = false, .zmpl_markdown_fragments = try generateMarkdownFragments(b), @@ -135,7 +138,7 @@ pub fn jetzigInit(b: *std.Build, exe: *std.Build.Step.Compile, options: JetzigIn const target = exe.root_module.resolved_target orelse @panic("Unable to detect compile target."); const optimize = exe.root_module.optimize orelse .Debug; - exe.use_llvm = exe.use_llvm orelse (optimize != .Debug); + exe.use_llvm = exe.use_llvm orelse use_llvm_default; if (optimize != .Debug) exe.linkLibC(); diff --git a/cli/build.zig.zon b/cli/build.zig.zon index c812754..75d1776 100644 --- a/cli/build.zig.zon +++ b/cli/build.zig.zon @@ -6,8 +6,8 @@ .dependencies = .{ .args = .{ - .url = "https://github.com/ikskuh/zig-args/archive/968258dc1b1230493d8f1677097c832a3d7e0bd8.tar.gz", - .hash = "1220bdedf1a993d852d8aebcd63922a8fb163fac37b9c6ff72d187b2847a4a3a4248", + .url = "https://github.com/bobf/zig-args/archive/88cbade9a517a4014824f8f53f3c48c8a0b2ffe1.tar.gz", + .hash = "zig_args-0.0.0-jqtN6P_NAAC97fGpk9hS2K681jkiqPsWP6w3ucb_ctGH", }, .jetquery = .{ .url = "https://github.com/jetzig-framework/jetquery/archive/795136c43f6d5bd216c136748bafd22892277725.tar.gz",