From 1d7a7b7b183bebb69342d66f3b2daec5adb3fd8c Mon Sep 17 00:00:00 2001
From: Jeremy Collins <jeremy.collins@beetlebug.org>
Date: Mon, 24 Aug 2026 14:45:22 -0400
Subject: [PATCH] Install the repacked archive from the lib step on macOS

The lib step installed the raw artifact, skipping the ld64 repack that
the default install runs, so `zig build lib` on macOS emitted an archive
Apple's linker rejects ("64-bit mach-o member not 8-byte aligned").
Both steps now install the macho-align.sh output.
---
 build.zig | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/build.zig b/build.zig
index a495bf5..2c6ed3f 100644
--- a/build.zig
+++ b/build.zig
@@ -700,32 +700,34 @@ pub fn build(b: *std.Build) void {
     // would be undefined at link time. Static libs default to NOT bundling it; force it on so
     // libtile57.a is self-contained for C consumers.
     lib.bundle_compiler_rt = true;
+    // `zig build lib` installs only libtile57.a for the resolved target. The
+    // default install also builds the host-only bake CLI (which force-links
+    // static musl and so can't cross-compile); an embedder cross-building the
+    // library for another platform — e.g. a Qt6 viewer for the reMarkable
+    // tablet (arm-linux-gnueabihf / aarch64-linux-gnu) — uses this step to get
+    // just the archive without the CLI.
+    const lib_only_step = b.step("lib", "Build only libtile57.a for the target");
     if (target.result.os.tag == .macos) {
         // Apple's ld64 rejects 64-bit mach-o archive members whose offsets aren't
         // 8-byte aligned, and Zig's archiver doesn't align them — so the raw
         // `zig build` archive fails to link into the CGO host ("... not 8-byte
         // aligned"). Re-pack it here, as part of the build, so a plain `zig build`
-        // alone emits an ld64-compatible libtile57.a (no wrapper needed):
-        // scripts/macho-align.sh partial-links every member into one relocatable
-        // object and re-wraps it with Apple's libtool. See the script for why.
+        // or `zig build lib` alone emits an ld64-compatible libtile57.a (no
+        // wrapper needed): scripts/macho-align.sh partial-links every member into
+        // one relocatable object and re-wraps it with Apple's libtool. See the
+        // script for why.
         const repack = b.addSystemCommand(&.{b.pathFromRoot("scripts/macho-align.sh")});
         repack.setEnvironmentVariable("ZIG", b.graph.zig_exe); // `zig ar` need not be on PATH
         repack.addFileArg(lib.getEmittedBin());
         const aligned = repack.addOutputFileArg("libtile57.a");
-        b.getInstallStep().dependOn(&b.addInstallLibFile(aligned, "libtile57.a").step);
+        const install_aligned = b.addInstallLibFile(aligned, "libtile57.a");
+        b.getInstallStep().dependOn(&install_aligned.step);
+        lib_only_step.dependOn(&install_aligned.step);
     } else {
         b.installArtifact(lib);
+        lib_only_step.dependOn(&b.addInstallArtifact(lib, .{}).step);
     }
 
-    // `zig build lib` installs only libtile57.a for the resolved target. The
-    // default install also builds the host-only bake CLI (which force-links
-    // static musl and so can't cross-compile); an embedder cross-building the
-    // library for another platform — e.g. a Qt6 viewer for the reMarkable
-    // tablet (arm-linux-gnueabihf / aarch64-linux-gnu) — uses this step to get
-    // just the archive without the CLI.
-    const lib_only_step = b.step("lib", "Build only libtile57.a for the target");
-    lib_only_step.dependOn(&b.addInstallArtifact(lib, .{}).step);
-
     // The offline baker / inspector CLI. It runs the embedded-Lua S-101 portrayal
     // so baked tiles get full S-101 styling (not the classify() fallback), so —
     // unlike the unit tests — its engine module is bake_root.zig (root.zig +