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

Merge 9d12e6d06f into 5a5a4135cb

Browse source
This commit is contained in:
Jason Sellers 2026-04-24 15:47:47 +00:00 • committed by GitHub
commit cb01123103
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 48 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

89
build.zig
View file

@ -26,29 +26,31 @@ pub fn build(b: *Build) !void {
const lua_src = b.dependency("lua", .{}); const lua_src = b.dependency("lua", .{});
const lib = const lib =
b.addStaticLibrary(artifactOptions( b.addLibrary(artifactOptions(
b,
.{ .shared = false }, .{ .shared = false },
.{ .target = target, .optimize = optimize }, .{ .target = target, .optimize = optimize },
)); ));
const shared = if (build_shared) const shared = if (build_shared)
b.addSharedLibrary(artifactOptions( b.addLibrary(artifactOptions(
b,
.{ .shared = true }, .{ .shared = true },
.{ .target = target, .optimize = optimize }, .{ .target = target, .optimize = optimize },
)) ))
else else
null; null;
const exe = b.addExecutable(artifactOptions(.exe, .{ const exe = b.addExecutable(artifactOptions(b, .exe, .{
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
})); }));
const exec = b.addExecutable(artifactOptions(.exec, .{ const exec = b.addExecutable(artifactOptions(b, .exec, .{
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
})); }));
if (!target.result.isMinGW()) { if (!target.result.isMinGW()) {
lib.linkSystemLibrary("m"); lib.root_module.linkSystemLibrary("m", .{});
exe.linkSystemLibrary("m"); exe.root_module.linkSystemLibrary("m", .{});
exec.linkSystemLibrary("m"); exec.root_module.linkSystemLibrary("m", .{});
} }
const build_targets = [_]?*Build.Step.Compile{ const build_targets = [_]?*Build.Step.Compile{
lib, lib,
@ -61,41 +63,30 @@ pub fn build(b: *Build) !void {
if (tr == null) if (tr == null)
continue; continue;
const t = tr.?; const t = tr.?;
t.linkLibC(); t.root_module.link_libc = true;
t.addIncludePath(lua_src.path("src")); t.root_module.addIncludePath(lua_src.path("src"));
switch (target.result.os.tag) { switch (target.result.os.tag) {
.aix => {
t.root_module.addCMacro("LUA_USE_POSIX", "");
t.root_module.addCMacro("LUA_USE_DLOPEN", "");
t.linkSystemLibrary("dl");
},
.freebsd, .netbsd, .openbsd => { .freebsd, .netbsd, .openbsd => {
t.root_module.addCMacro("LUA_USE_LINUX", ""); t.root_module.addCMacro("LUA_USE_LINUX", "");
t.root_module.addCMacro("LUA_USE_READLINE", ""); t.root_module.addCMacro("LUA_USE_READLINE", "");
t.addIncludePath(.{ .cwd_relative = "/usr/include/edit" }); t.root_module.addIncludePath(.{ .cwd_relative = "/usr/include/edit" });
t.linkSystemLibrary("edit"); t.root_module.linkSystemLibrary("edit", .{});
}, },
.ios => { .ios => {
t.root_module.addCMacro("LUA_USE_IOS", ""); t.root_module.addCMacro("LUA_USE_IOS", "");
}, },
.linux => { .linux => {
t.root_module.addCMacro("LUA_USE_LINUX", ""); t.root_module.addCMacro("LUA_USE_LINUX", "");
t.linkSystemLibrary("dl"); t.root_module.linkSystemLibrary("dl", .{});
if (use_readline.?) { if (use_readline.?) {
t.root_module.addCMacro("LUA_USE_READLINE", ""); t.root_module.addCMacro("LUA_USE_READLINE", "");
t.linkSystemLibrary("readline"); t.root_module.linkSystemLibrary("readline", .{});
} }
}, },
.macos => { .macos => {
t.root_module.addCMacro("LUA_USE_MACOSX", ""); t.root_module.addCMacro("LUA_USE_MACOSX", "");
t.root_module.addCMacro("LUA_USE_READLINE", ""); t.root_module.addCMacro("LUA_USE_READLINE", "");
t.linkSystemLibrary("readline"); t.root_module.linkSystemLibrary("readline", .{});
},
.solaris => {
t.root_module.addCMacro("LUA_USE_POSIX", "");
t.root_module.addCMacro("LUA_USE_DLOPEN", "");
t.root_module.addCMacro("_REENTRANT", "");
t.linkSystemLibrary("dl");
}, },
else => {}, else => {},
} }
@ -105,7 +96,7 @@ pub fn build(b: *Build) !void {
exe.root_module.addCMacro("LUA_BUILD_AS_DLL", ""); exe.root_module.addCMacro("LUA_BUILD_AS_DLL", "");
} }
if (shared) |s| { if (shared) |s| {
s.addCSourceFiles(.{ s.root_module.addCSourceFiles(.{
.root = lua_src.path("src"), .root = lua_src.path("src"),
.files = &base_src, .files = &base_src,
.flags = &cflags, .flags = &cflags,
@ -118,7 +109,7 @@ pub fn build(b: *Build) !void {
); );
} }
lib.addCSourceFiles(.{ lib.root_module.addCSourceFiles(.{
.root = lua_src.path("src"), .root = lua_src.path("src"),
.files = &base_src, .files = &base_src,
.flags = &cflags, .flags = &cflags,
@ -130,26 +121,26 @@ pub fn build(b: *Build) !void {
.{ .include_extensions = &lua_inc }, .{ .include_extensions = &lua_inc },
); );
exe.addCSourceFile(.{ exe.root_module.addCSourceFile(.{
.file = lua_src.path("src/lua.c"), .file = lua_src.path("src/lua.c"),
.flags = &cflags, .flags = &cflags,
}); });
exec.addCSourceFile(.{ exec.root_module.addCSourceFile(.{
.file = lua_src.path("src/luac.c"), .file = lua_src.path("src/luac.c"),
.flags = &cflags, .flags = &cflags,
}); });
if (shared) |s| { if (shared) |s| {
exe.linkLibrary(s); exe.root_module.linkLibrary(s);
b.installArtifact(s); b.installArtifact(s);
} else { } else {
exe.linkLibrary(lib); exe.root_module.linkLibrary(lib);
b.installArtifact(lib); b.installArtifact(lib);
} }
b.installArtifact(exe); b.installArtifact(exe);
exec.linkLibrary(lib); exec.root_module.linkLibrary(lib);
b.installArtifact(exec); b.installArtifact(exec);
b.installDirectory(.{ b.installDirectory(.{
@ -180,50 +171,44 @@ const ArtifactTargetOptions = struct {
target: ResolvedTarget, target: ResolvedTarget,
optimize: OptimizeMode, optimize: OptimizeMode,
}; };
fn artifactOptions(comptime options: ArtifactTarget, opts: ArtifactTargetOptions) switch (options) { fn artifactOptions(b: *Build, comptime options: ArtifactTarget, opts: ArtifactTargetOptions) switch (options) {
.exe, .exec => Build.ExecutableOptions, .exe, .exec => Build.ExecutableOptions,
.shared => |shared| if (shared) .shared => Build.LibraryOptions
Build.SharedLibraryOptions
else
Build.StaticLibraryOptions,
} { } {
const t = opts.target.result.os.tag; const t = opts.target.result.os.tag;
return switch (options) { return switch (options) {
.shared => |shared| if (shared) blk: { .shared => |shared| if (shared and t == .windows) .{
switch (t) {
.windows => break :blk .{
.name = lib_name ++ "54", .name = lib_name ++ "54",
.linkage = if (shared) .dynamic else .static,
.root_module = b.createModule(.{
.target = opts.target, .target = opts.target,
.optimize = opts.optimize, .optimize = opts.optimize,
.strip = true, .strip = true,
}, }),
else => break :blk .{ } else .{
.name = lib_name, .name = lib_name,
.linkage = if (shared) .dynamic else .static,
.root_module = b.createModule(.{
.target = opts.target, .target = opts.target,
.optimize = opts.optimize, .optimize = opts.optimize,
}, }),
}
} else blk: {
switch (t) {
else => break :blk .{
.name = lib_name,
.target = opts.target,
.optimize = opts.optimize,
},
}
}, },
.exe => switch (t) { .exe => switch (t) {
else => .{ else => .{
.name = exe_name, .name = exe_name,
.root_module = b.createModule(.{
.target = opts.target, .target = opts.target,
.optimize = opts.optimize, .optimize = opts.optimize,
}),
}, },
}, },
.exec => switch (t) { .exec => switch (t) {
else => .{ else => .{
.name = compiler_name, .name = compiler_name,
.root_module = b.createModule(.{
.target = opts.target, .target = opts.target,
.optimize = opts.optimize, .optimize = opts.optimize,
}),
}, },
}, },
}; };