Skip to content

Fix header installation in Zig Build System #445

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
gchatelet merged 1 commit into from
Apr 8, 2026
+12 −10
Merged

Fix header installation in Zig Build System #445

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
22 changes: 12 additions & 10 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ pub fn build(b: *std.Build) void {
.flags = &c_flags,
});
}

cpu_features.installHeader(b.path("include/cpuinfo_x86.h"), "cpuinfo_x86.h");
},
.aarch64, .aarch64_be => {
// AArch64 architecture - always needs cpuid
Expand All @@ -133,6 +135,8 @@ pub fn build(b: *std.Build) void {
.flags = &c_flags,
});
}

cpu_features.installHeader(b.path("include/cpuinfo_aarch64.h"), "cpuinfo_aarch64.h");
},
.arm, .armeb, .thumb, .thumbeb => {
// ARM (32-bit) architecture
Expand All @@ -151,6 +155,7 @@ pub fn build(b: *std.Build) void {
.flags = &c_flags,
});
}
cpu_features.installHeader(b.path("include/cpuinfo_mips.h"), "cpuinfo_mips.h");
},
.powerpc, .powerpcle, .powerpc64, .powerpc64le => {
// PowerPC architecture
Expand All @@ -160,6 +165,7 @@ pub fn build(b: *std.Build) void {
.flags = &c_flags,
});
}
cpu_features.installHeader(b.path("include/cpuinfo_ppc.h"), "cpuinfo_ppc.h");
},
.riscv32, .riscv64 => {
// RISC-V architecture
Expand All @@ -169,6 +175,7 @@ pub fn build(b: *std.Build) void {
.flags = &c_flags,
});
}
cpu_features.installHeader(b.path("include/cpuinfo_riscv.h"), "cpuinfo_riscv.h");
},
.s390x => {
// s390x architecture
Expand All @@ -178,6 +185,7 @@ pub fn build(b: *std.Build) void {
.flags = &c_flags,
});
}
cpu_features.installHeader(b.path("include/cpuinfo_s390x.h"), "cpuinfo_s390x.h");
},
.loongarch64 => {
// LoongArch architecture
Expand All @@ -187,12 +195,16 @@ pub fn build(b: *std.Build) void {
.flags = &c_flags,
});
}
cpu_features.installHeader(b.path("include/cpuinfo_loongarch.h"), "cpuinfo_loongarch.h");
},
else => {
std.debug.print("Warning: Unsupported architecture {s}\n", .{@tagName(cpu_arch)});
},
}

cpu_features.installHeader(b.path("include/cpu_features_cache_info.h"), "cpu_features_cache_info.h");
cpu_features.installHeader(b.path("include/cpu_features_macros.h"), "cpu_features_macros.h");

// Link against dl library on Unix-like systems
if (os_tag != .windows and os_tag != .wasi) {
cpu_features.linkSystemLibrary("dl");
Expand All @@ -201,15 +213,6 @@ pub fn build(b: *std.Build) void {
// Install the library if enabled
if (enable_install) {
b.installArtifact(cpu_features);

// Install headers
const install_headers = b.addInstallDirectory(.{
.source_dir = b.path("include"),
.install_dir = .header,
.install_subdir = "cpu_features",
.exclude_extensions = &.{},
});
b.getInstallStep().dependOn(&install_headers.step);
}

// Build list_cpu_features executable if requested
Expand All @@ -224,7 +227,6 @@ pub fn build(b: *std.Build) void {
});

list_cpu_features.linkLibrary(cpu_features);
list_cpu_features.addIncludePath(b.path("include"));

list_cpu_features.addCSourceFile(.{
.file = b.path("src/utils/list_cpu_features.c"),
Expand Down
Loading