Skip to content

Install the repacked archive from the lib step on macOS #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
beetlebugorg merged 1 commit into from
Aug 24, 2026
Merged

Install the repacked archive from the lib step on macOS #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 +
Expand Down
Loading