Maarrk/lua
1
0
Fork 0
mirror of https://github.com/allyourcodebase/lua.git synced 2026-05-01 11:17:58 +02:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

update to zig 0.15

Browse source
This commit is contained in:
Carmen 2025-09-23 23:23:25 +02:00
parent 5a5a4135cb
commit d923b295c8
No known key found for this signature in database
2 changed files with 36 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

104
build.zig
View file

@ -25,26 +25,44 @@ pub fn build(b: *Build) !void {
const lua_src = b.dependency("lua", .{});
const lib =
b.addStaticLibrary(artifactOptions(
.{ .shared = false },
.{ .target = target, .optimize = optimize },
));
const lib = b.addLibrary(.{
.name = lib_name,
.linkage = .static,
.root_module = b.createModule(.{
.link_libc = true,
.optimize = optimize,
.target = target,
}),
});
const shared = if (build_shared)
b.addSharedLibrary(artifactOptions(
.{ .shared = true },
.{ .target = target, .optimize = optimize },
))
b.addLibrary(.{
.name = lib_name ++ "54",
.linkage = .dynamic,
.root_module = b.createModule(.{
.link_libc = true,
.optimize = optimize,
.target = target,
.strip = if (target.result.os.tag == .windows) true else null,
}),
})
else
null;
const exe = b.addExecutable(artifactOptions(.exe, .{
.target = target,
const exe = b.addExecutable(.{
.name = exe_name,
.root_module = b.createModule(.{
.link_libc = true,
.optimize = optimize,
}));
const exec = b.addExecutable(artifactOptions(.exec, .{
.target = target,
}),
});
const exec = b.addExecutable(.{
.name = compiler_name,
.root_module = b.createModule(.{
.link_libc = true,
.optimize = optimize,
}));
.target = target,
}),
});
if (!target.result.isMinGW()) {
lib.linkSystemLibrary("m");
exe.linkSystemLibrary("m");
@ -170,64 +188,6 @@ pub fn build(b: *Build) !void {
});
unpack_step.dependOn(&unpack_cmd.step);
}
const ArtifactTarget = union(enum) {
// True if shared options
shared: bool,
exe,
exec,
};
const ArtifactTargetOptions = struct {
target: ResolvedTarget,
optimize: OptimizeMode,
};
fn artifactOptions(comptime options: ArtifactTarget, opts: ArtifactTargetOptions) switch (options) {
.exe, .exec => Build.ExecutableOptions,
.shared => |shared| if (shared)
Build.SharedLibraryOptions
else
Build.StaticLibraryOptions,
} {
const t = opts.target.result.os.tag;
return switch (options) {
.shared => |shared| if (shared) blk: {
switch (t) {
.windows => break :blk .{
.name = lib_name ++ "54",
.target = opts.target,
.optimize = opts.optimize,
.strip = true,
},
else => break :blk .{
.name = lib_name,
.target = opts.target,
.optimize = opts.optimize,
},
}
} else blk: {
switch (t) {
else => break :blk .{
.name = lib_name,
.target = opts.target,
.optimize = opts.optimize,
},
}
},
.exe => switch (t) {
else => .{
.name = exe_name,
.target = opts.target,
.optimize = opts.optimize,
},
},
.exec => switch (t) {
else => .{
.name = compiler_name,
.target = opts.target,
.optimize = opts.optimize,
},
},
};
}
const cflags = [_][]const u8{
"-std=gnu99",

2
build.zig.zon
View file

@ -3,7 +3,7 @@
.version = "5.4.7",
.fingerprint = 0xd671372bcadcaace,
.minimum_zig_version = "0.14.0",
.minimum_zig_version = "0.15.0",
.dependencies = .{
.lua = .{