mirrors/zap
1
0
Fork 0
mirror of https://github.com/zigzap/zap.git synced 2025-10-21 07:34:08 +00:00
Code Activity

Merge pull request #2 from qbradley/pkg

Browse source 
Update build.zig with breaking changes from zig master
This commit is contained in:
Rene Schallner 2023-02-12 13:31:28 +01:00 • committed by GitHub
commit 4eb2f61587
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
build.zig
View file

@ -1,15 +1,10 @@
const std = @import("std"); const std = @import("std");
const zap = std.build.Pkg{
.name = "zap",
.source = std.build.FileSource{ .path = "src/zap.zig" },
};
pub fn build(b: *std.build.Builder) !void { pub fn build(b: *std.build.Builder) !void {
const target = b.standardTargetOptions(.{});
// Standard release options allow the person running `zig build` to select // Standard release options allow the person running `zig build` to select
// between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall.
const mode = b.standardReleaseOptions(); const optimize = b.standardOptimizeOption(.{});
var ensure_step = b.step("deps", "ensure external dependencies"); var ensure_step = b.step("deps", "ensure external dependencies");
ensure_step.makeFn = ensureDeps; ensure_step.makeFn = ensureDeps;
@ -46,9 +41,14 @@ pub fn build(b: *std.build.Builder) !void {
const example_run_step = b.step(ex_run_stepname, ex_run_stepdesc); const example_run_step = b.step(ex_run_stepname, ex_run_stepdesc);
const example_step = b.step(ex_name, ex_build_desc); const example_step = b.step(ex_name, ex_build_desc);
var example = b.addExecutable(ex_name, ex_src); var example = b.addExecutable(.{
example.setBuildMode(mode); .name = ex_name,
example.addPackage(zap); .root_source_file = .{ .path = ex_src },
.target = target,
.optimize = optimize,
});
const zap_module = b.createModule(.{ .source_file = .{ .path = "src/zap.zig" } });
example.addModule("zap", zap_module);
try addFacilio(example, "./"); try addFacilio(example, "./");
const example_run = example.run(); const example_run = example.run();
@ -75,13 +75,12 @@ pub fn ensureDeps(step: *std.build.Step) !void {
try makeFacilioLibdump(allocator); try makeFacilioLibdump(allocator);
} }
pub fn addFacilio(exe: *std.build.LibExeObjStep, comptime p: [*]const u8) !void { pub fn addFacilio(exe: *std.build.CompileStep, comptime p: [*]const u8) !void {
var b = exe.builder;
exe.linkLibC(); exe.linkLibC();
// Generate flags // Generate flags
var flags = std.ArrayList([]const u8).init(std.heap.page_allocator); var flags = std.ArrayList([]const u8).init(std.heap.page_allocator);
if (b.is_release) try flags.append("-Os"); if (exe.optimize != .Debug) try flags.append("-Os");
try flags.append("-Wno-return-type-c-linkage"); try flags.append("-Wno-return-type-c-linkage");
try flags.append("-fno-sanitize=undefined"); try flags.append("-fno-sanitize=undefined");
try flags.append("-DFIO_OVERRIDE_MALLOC"); try flags.append("-DFIO_OVERRIDE_MALLOC");
@ -107,7 +106,7 @@ pub fn addFacilio(exe: *std.build.LibExeObjStep, comptime p: [*]const u8) !void
}, flags.items); }, flags.items);
} }
pub fn addZap(exe: *std.build.LibExeObjStep, comptime p: [*]const u8) !void { pub fn addZap(exe: *std.build.CompileStep, comptime p: [*]const u8) !void {
try addFacilio(exe, p); try addFacilio(exe, p);
var b = exe.builder; var b = exe.builder;
var ensure_step = b.step("zap-deps", "ensure zap's dependencies"); var ensure_step = b.step("zap-deps", "ensure zap's dependencies");