Skip to content

Update to Zig 0.15.2 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update to Zig 0.15.2 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c3677e
update to Zig 0.15.2
leroycep Oct 19, 2025
da85a44
fix cross compilation to Windows
leroycep Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 90 additions & 89 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,19 @@ pub fn build(b: *std.Build) void {
const make_dep = b.dependency("make", .{});
const make_root = make_dep.path(".");

const make_exe= blk: {
const exe = b.addExecutable(.{
.name = "make",
const make_exe = blk: {
const module = b.createModule(.{
.target = target,
.optimize = optimize,
});

exe.addIncludePath(b.path("inc"));
exe.addIncludePath(make_dep.path("src"));
module.addIncludePath(b.path("inc"));
module.addIncludePath(make_dep.path("src"));
if (target.result.os.tag == .windows) {
exe.addIncludePath(make_dep.path("src/w32/include"));
module.addIncludePath(make_dep.path("src/w32/include"));
}
const config_header = b.addConfigHeader(.{
.style = .{ .autoconf = make_dep.path("src/config.h.in") },
.style = .{ .autoconf_undef = make_dep.path("src/config.h.in") },
.include_path = "config.h",
}, make_config);
switch (target.result.os.tag) {
Expand All @@ -31,53 +30,53 @@ pub fn build(b: *std.Build) void {
.HAVE_FCNTL_H = null,
.HAVE_STPCPY = 0,
}),
else => config_header.addValues(.{
.PATH_SEPARATOR_CHAR = .@"':'",
.HAVE_DOS_PATHS = null,
.HAVE_UNISTD_H = 1,
.HAVE_FCNTL_H = 1,
.HAVE_STPCPY = 1,
}),
else => {
config_header.addValues(.{
.PATH_SEPARATOR_CHAR = .@"':'",
.HAVE_DOS_PATHS = null,
.HAVE_UNISTD_H = 1,
.HAVE_FCNTL_H = 1,
.HAVE_STPCPY = 1,
});
module.addCMacro("_GNU_SOURCE", "1");
module.addCMacro("__GNU_LIBRARY__", "1");
},
}
if (target_has_sys_siglist(target)) {
config_header.addValues(.{
.HAVE_DECL_SYS_SIGLIST = 1,
});
exe.defineCMacro("SYS_SIGLIST_DECLARED", "1");
module.addCMacro("SYS_SIGLIST_DECLARED", "1");
} else {
config_header.addValues(.{
.HAVE_DECL_SYS_SIGLIST = 0,
});
}

if (target.result.os.tag == .windows) {
exe.defineCMacro("_POSIX_", "1");
exe.defineCMacro("putenv", "_putenv");
exe.defineCMacro("getpid", "_getpid");
exe.defineCMacro("fdopen", "_fdopen");
exe.defineCMacro("environ", "(*__p__environ())");
module.addCMacro("_POSIX_", "1");
module.addCMacro("putenv", "_putenv");
module.addCMacro("getpid", "_getpid");
module.addCMacro("fdopen", "_fdopen");
module.addCMacro("environ", "(*__p__environ())");
} else {
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
exe.defineCMacro("LOCALEDIR", "\".\"");
module.addCMacro("LOCALEDIR", "\".\"");
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
exe.defineCMacro("LIBDIR", "\"lib\"");
}
if (target.result.isGnuLibC()) {
// TODO: only do this if we are compiling against gnu
//exe.defineCMacro("__USE_GNU", "1");
exe.defineCMacro("_GNU_SOURCE", "1");
module.addCMacro("LIBDIR", "\"lib\"");
}
const write_files = b.addWriteFiles();
_ = write_files.addCopyFile(b.path("mkcustom.h"), "src/mkcustom.h");
if (target.result.os.tag == .windows) {
_ = write_files.addCopyFile(make_dep.path("src/config.h.W32"), "src/config.h");
} else {
_ = write_files.addCopyFile(config_header.getOutput(), "src/config.h");
_ = write_files.addCopyFile(config_header.getOutputFile(), "src/config.h");
}

exe.addIncludePath(write_files.getDirectory().path(b, "src"));
const config_header_include_path = write_files.getDirectory().path(b, "src");
module.addIncludePath(config_header_include_path);

exe.addCSourceFiles(.{
module.addCSourceFiles(.{
.root = make_root,
.files = switch (target.result.os.tag) {
.windows => &make_files_windows,
Expand All @@ -90,16 +89,21 @@ pub fn build(b: *std.Build) void {
"-Werror=implicit-function-declaration",
},
});
module.link_libc = true;
switch (target.result.os.tag) {
.macos => {
// ????????????????????????????????????????????????????????????????????????????????
//exe.linkFramework("Foundation");
},
else => {},
}
exe.linkLibC();
linkGlob(b, target, optimize, make_dep, exe);

module.linkLibrary(buildGlobLib(b, target, optimize, make_dep, config_header_include_path));

const exe = b.addExecutable(.{
.name = "make",
.root_module = module,
});
b.installArtifact(exe);
break :blk exe;
};
Expand All @@ -123,9 +127,9 @@ pub fn build(b: *std.Build) void {
}

fn target_has_sys_siglist(t: std.Build.ResolvedTarget) bool {
if (t.result.isDarwin()) return true;
if (t.result.isGnuLibC()) {
const vr = t.result.os.getVersionRange();
if (t.result.os.tag.isDarwin()) return true;
if (t.result.abi.isGnu()) {
const vr = t.result.os.versionRange();
// newer glibc does not allow linking with sys_siglist
// https://lists.gnu.org/archive/html/info-gnu/2020-08/msg00002.html
if (vr == .linux and vr.linux.glibc.major >= 2 and vr.linux.glibc.minor >= 32)
Expand All @@ -135,81 +139,78 @@ fn target_has_sys_siglist(t: std.Build.ResolvedTarget) bool {
return false;
}

fn linkGlob(
b: *std.Build,
target: std.Build.ResolvedTarget,
optimize: std.builtin.OptimizeMode,
make_dep: *std.Build.Dependency,
make_exe: *std.Build.Step.Compile
) void {
if (target.result.os.tag != .windows)
return;

const lib = b.addStaticLibrary(.{
.name = "glob",
fn buildGlobLib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.builtin.OptimizeMode, make_dep: *std.Build.Dependency, include_dir: std.Build.LazyPath) *std.Build.Step.Compile {
const module = b.createModule(.{
.target = target,
.optimize = optimize,
.link_libc = true,
});
const config_header = b.addConfigHeader(.{
.style = .{ .autoconf = make_dep.path("lib/glob.in.h") },

module.addIncludePath(include_dir);

const glob_header = b.addConfigHeader(.{
.style = .{ .autoconf_at = make_dep.path("lib/glob.in.h") },
.include_path = "glob.h",
}, .{});
lib.addConfigHeader(config_header);
lib.installConfigHeader(config_header);
module.addConfigHeader(glob_header);

const fnmatch_header = b.addConfigHeader(.{
.style = .{ .autoconf = make_dep.path("lib/fnmatch.in.h") },
.style = .{ .autoconf_undef = make_dep.path("lib/fnmatch.in.h") },
.include_path = "fnmatch.h",
}, .{
.FNM_PATHNAME = null,
.FNM_NOESCAPE = null,
.FNM_PERIOD = null,
}, .{
.FNM_PATHNAME = null,
.FNM_NOESCAPE = null,
.FNM_PERIOD = null,
});
lib.addConfigHeader(fnmatch_header);
make_exe.addConfigHeader(fnmatch_header);
module.addConfigHeader(fnmatch_header);

module.addCMacro("_GNU_SOURCE", "1");
module.addCMacro("HAVE_CONFIG_H", "1");
module.addIncludePath(make_dep.path("src"));
module.addIncludePath(make_dep.path("lib"));

const write_files = b.addWriteFiles();
_ = write_files.addCopyFile(make_dep.path("src/config.h.W32"), "src/config.h");
lib.defineCMacro("HAVE_CONFIG_H", "1");
lib.addIncludePath(make_dep.path("src"));
lib.addIncludePath(make_dep.path("lib"));
lib.addIncludePath(write_files.getDirectory().path(b, "src"));
// const write_files = b.addWriteFiles();
// _ = write_files.addCopyFile(make_dep.path("src/config.h.W32"), "src/config.h");
// module.addIncludePath(write_files.getDirectory().path(b, "src"));

lib.addCSourceFiles(.{
module.addCSourceFiles(.{
.root = make_dep.path("."),
.files = &.{
"lib/fnmatch.c",
"lib/glob.c",
},
});
lib.linkLibC();

make_exe.linkLibrary(lib);
const lib = b.addLibrary(.{
.name = "glob",
.root_module = module,
});
lib.installConfigHeader(fnmatch_header);
lib.installConfigHeader(glob_header);
return lib;
}

const make_files_common = [_][]const u8{
"src/ar.c", "src/arscan.c", "src/commands.c",
"src/default.c", "src/dir.c", "src/expand.c",
"src/file.c", "src/function.c", "src/getopt.c",
"src/getopt1.c", "src/guile.c",
"src/hash.c", "src/implicit.c", "src/job.c",
"src/load.c", "src/loadapi.c", "src/main.c", "src/misc.c",
"src/output.c", "src/read.c",
"src/remake.c", "src/rule.c", "src/shuffle.c",
"src/signame.c", "src/strcache.c", "src/variable.c",
"src/version.c", "src/vpath.c",
"src/ar.c", "src/arscan.c", "src/commands.c",
"src/default.c", "src/dir.c", "src/expand.c",
"src/file.c", "src/function.c", "src/getopt.c",
"src/getopt1.c", "src/guile.c", "src/hash.c",
"src/implicit.c", "src/job.c", "src/load.c",
"src/loadapi.c", "src/main.c", "src/misc.c",
"src/output.c", "src/read.c", "src/remake.c",
"src/rule.c", "src/shuffle.c", "src/signame.c",
"src/strcache.c", "src/variable.c", "src/version.c",
"src/vpath.c",
// ????????????????????????????????????????????????????????????????????????????????
"src/remote-stub.c",
"src/remote-stub.c",
};
const make_files_generic = make_files_common ++ [_][]const u8 {
const make_files_generic = make_files_common ++ [_][]const u8{
"src/posixos.c",
};
const make_files_windows = make_files_common ++ [_][]const u8 {
"src/w32/pathstuff.c", "src/w32/w32os.c", "src/w32/compat/dirent.c",
"src/w32/compat/posixfcn.c",
"src/w32/subproc/misc.c",
"src/w32/subproc/sub_proc.c", "src/w32/subproc/w32err.c",
"lib/getloadavg.c",
const make_files_windows = make_files_common ++ [_][]const u8{
"src/w32/pathstuff.c", "src/w32/w32os.c", "src/w32/compat/dirent.c",
"src/w32/compat/posixfcn.c", "src/w32/subproc/misc.c", "src/w32/subproc/sub_proc.c",
"src/w32/subproc/w32err.c", "lib/getloadavg.c",
};

const make_config = .{
Expand Down Expand Up @@ -332,15 +333,15 @@ const make_config = .{
.HAVE_STDINT_H = 1,
.HAVE_STDIO_H = 1,
.HAVE_STDLIB_H = 1,
.HAVE_STRCASECMP = null,
.HAVE_STRCMPI = null,
.HAVE_STRCASECMP = 1,
.HAVE_STRCMPI = 1,
.HAVE_STRCOLL = null,
.HAVE_STRDUP = null,
.HAVE_STRERROR = null,
.HAVE_STRICMP = null,
.HAVE_STRINGS_H = null,
.HAVE_STRING_H = 1,
.HAVE_STRNCASECMP = null,
.HAVE_STRNCASECMP = 1,
.HAVE_STRNCMPI = null,
.HAVE_STRNDUP = null,
.HAVE_STRNICMP = null,
Expand Down Expand Up @@ -429,7 +430,7 @@ const make_config = .{
._TIME_BITS = null,
.__MINGW_USE_VC2005_COMPAT = null,
.@"const" = .@"const",
.eaccess = null ,
.eaccess = null,
.gid_t = null,
.off_t = null,
.pid_t = null,
Expand Down
7 changes: 4 additions & 3 deletions build.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
.{
.name = "gnumake",
.name = .gnumake,
.fingerprint = 0xeb3905f27fdebc75,
.version = "0.0.0",
.minimum_zig_version = "0.12.0",
.minimum_zig_version = "0.15.0",
.dependencies = .{
.make = .{
.url = "https://ftp.gnu.org/gnu/make/make-4.4.1.tar.gz",
.hash = "12205f66cba6fc33b91195339f50617f28b1de62806ad556247e34bb3e8a7fa4c382",
.hash = "N-V-__8AAO76hQBfZsum_DO5EZUzn1Bhfyix3mKAatVWJH40",
},
},
.paths = .{
Expand Down