diff --git a/build.zig b/build.zig
index bc47c5e..80a9274 100644
--- a/build.zig
+++ b/build.zig
@@ -4,6 +4,7 @@ const builtin = @import("builtin");
 const optimize_deps = .ReleaseFast;
 
 pub fn build(b: *std.Build) void {
+    const release = b.option(bool, "package_release", "Build all release targets") orelse false;
     const tracy_enabled = b.option(bool, "enable_tracy", "Enable tracy client library (default: no)") orelse false;
     const use_tree_sitter = b.option(bool, "use_tree_sitter", "Enable tree-sitter (default: yes)") orelse true;
     const strip = b.option(bool, "strip", "Disable debug information (default: no)");
@@ -23,15 +24,6 @@ pub fn build(b: *std.Build) void {
         version.appendSlice(b.allocator, "unknown") catch {};
     };
 
-    const release = switch (b.release_mode) {
-        .off => false,
-        .any => blk: {
-            b.release_mode = .safe;
-            break :blk true;
-        },
-        else => true,
-    };
-
     return (if (release) &build_release else &build_development)(
         b,
         run_step,
@@ -108,9 +100,8 @@ fn build_release(
         // .{ .cpu_arch = .x86_64, .os_tag = .windows },
         // .{ .cpu_arch = .aarch64, .os_tag = .windows },
     };
-    const optimize = b.standardOptimizeOption(.{});
-    const optimize_release = optimize;
-    const optimize_debug = optimize;
+    const optimize_release = .ReleaseFast;
+    const optimize_debug = .ReleaseSafe;
 
     const write_file_step = b.addWriteFiles();
     const version_file = write_file_step.add("version", version);
@@ -591,7 +582,7 @@ pub fn build_exe(
     if (use_llvm) |value| {
         exe.use_llvm = value;
         exe.use_lld = value;
-    } else if (target.result.os.tag != .macos) {
+    } else {
         exe.use_llvm = true;
         exe.use_lld = true;
     }
diff --git a/contrib/make_nightly_build b/contrib/make_nightly_build
index 30c1e35..65949c5 100755
--- a/contrib/make_nightly_build
+++ b/contrib/make_nightly_build
@@ -83,7 +83,7 @@ echo running tests...
 
 echo building...
 
-./zig build --release --prefix "$DESTDIR/build"
+./zig build -Dpackage_release --prefix "$DESTDIR/build"
 
 VERSION=$(/bin/cat "$DESTDIR/build/version")
 
diff --git a/contrib/make_release b/contrib/make_release
index 4dbe907..7d94a3f 100755
--- a/contrib/make_release
+++ b/contrib/make_release
@@ -18,7 +18,7 @@ echo running tests...
 
 echo building...
 
-./zig build --release --prefix "$DESTDIR/build"
+./zig build -Dpackage_release --prefix "$DESTDIR/build"
 
 cd "$DESTDIR/build"