From 5931869bca14f5c875f8affbe6d51af3e353dbd7 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 8 Dec 2025 15:42:58 +0100
Subject: [PATCH] Zig-master compat

---
 build.zig | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.zig b/build.zig
index 4da245f8..5a40dd56 100644
--- a/build.zig
+++ b/build.zig
@@ -7,8 +7,9 @@ const Compile = std.Build.Step.Compile;
 const Target = std.Target;
 
 fn initLibConfig(b: *std.Build, target: std.Build.ResolvedTarget, lib: *Compile) void {
-    lib.linkLibC();
-    lib.addIncludePath(b.path("src/libsodium/include/sodium"));
+    lib.root_module.link_libc = true;
+    lib.lto = null;
+    lib.root_module.addIncludePath(b.path("src/libsodium/include/sodium"));
     lib.root_module.addCMacro("_GNU_SOURCE", "1");
     lib.root_module.addCMacro("CONFIGURED", "1");
     lib.root_module.addCMacro("DEV_MODE", "1");
@@ -20,7 +21,6 @@ fn initLibConfig(b: *std.Build, target: std.Build.ResolvedTarget, lib: *Compile)
     lib.root_module.addCMacro("HAVE_INTTYPES_H", "1");
     lib.root_module.addCMacro("HAVE_STDINT_H", "1");
     lib.root_module.addCMacro("HAVE_TI_MODE", "1");
-    lib.want_lto = false;
 
     const endian = target.result.cpu.arch.endian();
     switch (endian) {
@@ -242,13 +242,13 @@ pub fn build(b: *std.Build) !void {
             if (mem.endsWith(u8, name, ".c")) {
                 const full_path = try fmt.allocPrint(allocator, "{s}/{s}", .{ src_path, entry.path });
 
-                lib.addCSourceFiles(.{
+                lib.root_module.addCSourceFiles(.{
                     .files = &.{full_path},
                     .flags = flags,
                 });
             } else if (mem.endsWith(u8, name, ".S")) {
                 const full_path = try fmt.allocPrint(allocator, "{s}/{s}", .{ src_path, entry.path });
-                lib.addAssemblyFile(b.path(full_path));
+                lib.root_module.addAssemblyFile(b.path(full_path));
             }
         }
     }
@@ -281,14 +281,14 @@ pub fn build(b: *std.Build) !void {
                     .target = target,
                     .optimize = optimize,
                     .strip = true,
+                    .link_libc = true,
                 }),
             });
-            exe.linkLibC();
-            exe.linkLibrary(static_lib);
-            exe.addIncludePath(b.path("src/libsodium/include"));
-            exe.addIncludePath(b.path("test/quirks"));
+            exe.root_module.linkLibrary(static_lib);
+            exe.root_module.addIncludePath(b.path("src/libsodium/include"));
+            exe.root_module.addIncludePath(b.path("test/quirks"));
             const full_path = try fmt.allocPrint(allocator, "{s}/{s}", .{ test_path, entry.path });
-            exe.addCSourceFiles(.{ .files = &.{full_path} });
+            exe.root_module.addCSourceFiles(.{ .files = &.{full_path} });
             if (enable_benchmarks) {
                 exe.root_module.addCMacro("BENCHMARKS", "1");
                 var buf: [16]u8 = undefined;