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: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: true
matrix:
zig-version: [0.14.1]
zig-version: [0.15.1]
os: [ubuntu-latest, windows-latest, macos-latest]
runs-on: ${{matrix.os}}
steps:
Expand Down
33 changes: 25 additions & 8 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,15 @@ pub fn build(b: *std.Build) void {
const include_path = rabbitizer_dep.path("include");
const include_path_xx = rabbitizer_dep.path("cplusplus/include");

var extra_flags: std.BoundedArray([]const u8, 8) = .{};
var buf: [25][]const u8 = undefined;
var flags: std.ArrayList([]const u8) = .initBuffer(&buf);

flags.appendSliceAssumeCapacity(&(warnings ++ c_warnings ++ c_flags));

var buf_xx: [24][]const u8 = undefined;
var flags_xx: std.ArrayList([]const u8) = .initBuffer(&buf_xx);

flags_xx.appendSliceAssumeCapacity(&(warnings ++ cpp_warnings ++ cpp_flags));

const mod, const mod_xx = .{
b.createModule(.{
Expand All @@ -56,19 +64,28 @@ pub fn build(b: *std.Build) void {
};

if (optimize != .Debug) {
extra_flags.appendSliceAssumeCapacity(&.{ "-Os", "-g" });
flags.appendSliceAssumeCapacity(&.{ "-Os", "-g" });
flags_xx.appendSliceAssumeCapacity(&.{ "-Os", "-g" });
} else {
extra_flags.appendSliceAssumeCapacity(&.{ "-O0", "-g3" });
flags.appendSliceAssumeCapacity(&.{ "-O0", "-g3" });
flags_xx.appendSliceAssumeCapacity(&.{ "-O0", "-g3" });
mod.addCMacro("DEVELOPMENT", "1");
mod_xx.addCMacro("DEVELOPMENT", "1");
}

if (werror) {
extra_flags.appendAssumeCapacity("-Werror");
flags.appendAssumeCapacity("-Werror");
flags_xx.appendAssumeCapacity("-Werror");
}

if (asan) {
extra_flags.appendSliceAssumeCapacity(&.{
flags.appendSliceAssumeCapacity(&.{
"-fsanitize=address",
"-fsanitize=pointer-compare",
"-fsanitize=pointer-subtract",
"-fsanitize=undefined",
});
flags_xx.appendSliceAssumeCapacity(&.{
"-fsanitize=address",
"-fsanitize=pointer-compare",
"-fsanitize=pointer-subtract",
Expand Down Expand Up @@ -106,7 +123,7 @@ pub fn build(b: *std.Build) void {
lib.addCSourceFiles(.{
.root = src_root,
.files = &c_src,
.flags = &(warnings ++ c_warnings ++ c_flags ++ extra_flags.buffer),
.flags = flags.items,
});

lib.installHeadersDirectory(
Expand All @@ -125,12 +142,12 @@ pub fn build(b: *std.Build) void {
lib_xx.addCSourceFiles(.{
.root = src_root,
.files = &c_src,
.flags = &(warnings ++ c_warnings ++ c_flags ++ extra_flags.buffer),
.flags = flags.items,
});
lib_xx.addCSourceFiles(.{
.root = src_root_xx,
.files = &cpp_src,
.flags = &(warnings ++ cpp_warnings ++ cpp_flags ++ extra_flags.buffer),
.flags = flags_xx.items,
});

lib_xx.installHeadersDirectory(
Expand Down
1 change: 1 addition & 0 deletions build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.name = .rabbitizer,
.version = "1.3.0",
.fingerprint = 0x4ea9905eab1bf0f4, // Changing this has security and trust implications.
.minimum_zig_version = "0.15.1",
.dependencies = .{
.upstream = .{
.url = "https://github.com/Decompollaborate/rabbitizer/archive/refs/tags/1.3.0.tar.gz",
Expand Down
Loading