neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into zig-0.14

Browse source
This commit is contained in:
CJ van den Berg 2025-02-06 22:18:42 +01:00
commit 53340d7ef0
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build.zig
View file

@ -177,7 +177,7 @@ pub fn build_exe(
var version_info = std.ArrayList(u8).init(b.allocator); var version_info = std.ArrayList(u8).init(b.allocator);
defer version_info.deinit(); defer version_info.deinit();
gen_version_info(b, target, version_info.writer()) catch { gen_version_info(b, target, version_info.writer(), optimize) catch {
version_info.clearAndFree(); version_info.clearAndFree();
version_info.appendSlice("unknown") catch {}; version_info.appendSlice("unknown") catch {};
}; };
@ -586,6 +586,7 @@ fn gen_version_info(
b: *std.Build, b: *std.Build,
target: std.Build.ResolvedTarget, target: std.Build.ResolvedTarget,
writer: anytype, writer: anytype,
optimize: std.builtin.OptimizeMode,
) !void { ) !void {
var code: u8 = 0; var code: u8 = 0;
@ -629,7 +630,7 @@ fn gen_version_info(
try writer.print("branch: {s} at {s}\n", .{ branch, remote }); try writer.print("branch: {s} at {s}\n", .{ branch, remote });
try writer.print("built with: zig {s} ({s})\n", .{ builtin.zig_version_string, @tagName(builtin.zig_backend) }); try writer.print("built with: zig {s} ({s})\n", .{ builtin.zig_version_string, @tagName(builtin.zig_backend) });
try writer.print("build mode: {s}\n", .{@tagName(builtin.mode)}); try writer.print("build mode: {s}\n", .{@tagName(optimize)});
if (log.len > 0) if (log.len > 0)
try writer.print("\nwith the following diverging commits:\n{s}\n", .{log}); try writer.print("\nwith the following diverging commits:\n{s}\n", .{log});