Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@ Add a `zapi` field to your `package.json`:
"x86_64-unknown-linux-gnu",
"x86_64-unknown-linux-musl",
"aarch64-unknown-linux-gnu",
"aarch64-unknown-linux-musl",
"x86_64-apple-darwin",
"aarch64-apple-darwin",
"x86_64-pc-windows-msvc"
Expand All @@ -560,6 +561,7 @@ Add a `zapi` field to your `package.json`:
| `aarch64-apple-darwin` | macOS | arm64 | - |
| `x86_64-apple-darwin` | macOS | x64 | - |
| `aarch64-unknown-linux-gnu` | Linux | arm64 | glibc |
| `aarch64-unknown-linux-musl` | Linux | arm64 | musl |
| `x86_64-unknown-linux-gnu` | Linux | x64 | glibc |
| `x86_64-unknown-linux-musl` | Linux | x64 | musl |
| `x86_64-pc-windows-msvc` | Windows | x64 | msvc |
Expand Down
32 changes: 32 additions & 0 deletions examples/targets/mod.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import {afterEach, describe, expect, it, vi} from "vitest";

afterEach(() => {
vi.doUnmock("node:fs");
vi.resetModules();
});

describe("aarch64 musl target", () => {
it("maps package and Zig target metadata", async () => {
const {getTargetParts} = await import("../../ts/config.js");
const {TARGETS, getZigTriple} = await import("../../ts/lib.js");

expect(TARGETS).toContain("aarch64-unknown-linux-musl");
expect(getZigTriple("aarch64-unknown-linux-musl")).toBe("aarch64-linux-musl");
expect(getTargetParts("aarch64-unknown-linux-musl")).toEqual({
abi: "musl",
arch: "arm64",
platform: "linux",
});
});

it("selects the target on an ARM64 musl runtime", async () => {
vi.doMock("node:fs", async () => {
const fs = await vi.importActual<typeof import("node:fs")>("node:fs");
return {...fs, readFileSync: vi.fn(() => "musl libc")};
});

const {getTarget} = await import("../../ts/lib.js");

expect(getTarget("linux", "arm64")).toBe("aarch64-unknown-linux-musl");
});
});
5 changes: 5 additions & 0 deletions ts/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@ export function getTargetParts(target: Target): {platform: NodeJS.Platform; arch
arch = "arm64";
abi = "gnu";
break;
case "aarch64-unknown-linux-musl":
platform = "linux";
arch = "arm64";
abi = "musl";
break;
case "x86_64-apple-darwin":
platform = "darwin";
arch = "x64";
Expand Down
5 changes: 4 additions & 1 deletion ts/lib.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const require = createRequire(import.meta.url);
export const TARGETS = [
"aarch64-apple-darwin",
"aarch64-unknown-linux-gnu",
"aarch64-unknown-linux-musl",
"x86_64-apple-darwin",
"x86_64-unknown-linux-gnu",
"x86_64-unknown-linux-musl",
Expand Down Expand Up @@ -121,6 +122,8 @@ export function getZigTriple(target: Target): string {
return "x86_64-linux-musl";
case "aarch64-unknown-linux-gnu":
return "aarch64-linux-gnu";
case "aarch64-unknown-linux-musl":
return "aarch64-linux-musl";
case "x86_64-apple-darwin":
return "x86_64-macos-none";
case "aarch64-apple-darwin":
Expand Down Expand Up @@ -189,7 +192,7 @@ export function getTarget(platform: NodeJS.Platform, arch: NodeJS.Architecture):
}
} else if (platform === "linux") {
const abi = isMusl() ? "musl" : "gnu";
if (arch === "arm64" && abi === "gnu") {
if (arch === "arm64") {
return `aarch64-unknown-linux-${abi}`;
}
if (arch === "x64") {
Expand Down
Loading