Merge tag '0.15.2' into zig0-0.15.2
Release 0.15.2
This commit is contained in:
14
build.zig
14
build.zig
@@ -33,7 +33,7 @@ const zig0_cflags = &[_][]const u8{
|
||||
};
|
||||
const zig0_compilers = &[_][]const u8{ "zig", "clang", "gcc", "tcc" };
|
||||
|
||||
const zig_version: std.SemanticVersion = .{ .major = 0, .minor = 15, .patch = 1 };
|
||||
const zig_version: std.SemanticVersion = .{ .major = 0, .minor = 15, .patch = 2 };
|
||||
const stack_size = 46 * 1024 * 1024;
|
||||
|
||||
pub fn build(b: *std.Build) !void {
|
||||
@@ -296,15 +296,15 @@ pub fn build(b: *std.Build) !void {
|
||||
2 => {
|
||||
// Untagged development build (e.g. 0.10.0-dev.2025+ecf0050a9).
|
||||
var it = mem.splitScalar(u8, git_describe, '-');
|
||||
//const tagged_ancestor = it.first();
|
||||
const tagged_ancestor = it.first();
|
||||
const commit_height = it.next().?;
|
||||
const commit_id = it.next().?;
|
||||
|
||||
//const ancestor_ver = try std.SemanticVersion.parse(tagged_ancestor);
|
||||
//if (zig_version.order(ancestor_ver) != .gt) {
|
||||
// std.debug.print("Zig version '{f}' must be greater than tagged ancestor '{f}'\n", .{ zig_version, ancestor_ver });
|
||||
// std.process.exit(1);
|
||||
//}
|
||||
const ancestor_ver = try std.SemanticVersion.parse(tagged_ancestor);
|
||||
if (zig_version.order(ancestor_ver) != .gt) {
|
||||
std.debug.print("Zig version '{f}' must be greater than tagged ancestor '{f}'\n", .{ zig_version, ancestor_ver });
|
||||
std.process.exit(1);
|
||||
}
|
||||
|
||||
// Check that the commit hash is prefixed with a 'g' (a Git convention).
|
||||
if (commit_id.len < 1 or commit_id[0] != 'g') {
|
||||
|
||||
Reference in New Issue
Block a user