Skip to content

Commit a19a4b2

Browse files
committed
update build.zig to master build
1 parent 52bb63c commit a19a4b2

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

build.zig

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ const std = @import("std");
33
const ArrayList = std.ArrayList;
44
const Compile = std.Build.Step.Compile;
55
const ConfigHeader = std.Build.Step.ConfigHeader;
6-
const Mode = std.builtin.Mode;
7-
const CrossTarget = std.zig.CrossTarget;
6+
const Mode = std.builtin.OptimizeMode;
7+
const Target = std.Build.ResolvedTarget;
88

99
const Maker = struct {
10-
builder: *std.build.Builder,
11-
target: CrossTarget,
10+
builder: *std.Build,
11+
target: Target,
1212
optimize: Mode,
1313
enable_lto: bool,
1414

@@ -34,10 +34,10 @@ const Maker = struct {
3434
try m.addCxxFlag(flag);
3535
}
3636

37-
fn init(builder: *std.build.Builder) !Maker {
37+
fn init(builder: *std.Build) !Maker {
3838
const target = builder.standardTargetOptions(.{});
3939
const zig_version = @import("builtin").zig_version_string;
40-
const commit_hash = try std.ChildProcess.exec(
40+
const commit_hash = try std.ChildProcess.run(
4141
.{ .allocator = builder.allocator, .argv = &.{ "git", "rev-parse", "HEAD" } },
4242
);
4343
try std.fs.cwd().writeFile("common/build-info.cpp", builder.fmt(
@@ -46,7 +46,7 @@ const Maker = struct {
4646
\\char const *LLAMA_COMPILER = "Zig {s}";
4747
\\char const *LLAMA_BUILD_TARGET = "{s}";
4848
\\
49-
, .{ 0, commit_hash.stdout[0 .. commit_hash.stdout.len - 1], zig_version, try target.allocDescription(builder.allocator) }));
49+
, .{ 0, commit_hash.stdout[0 .. commit_hash.stdout.len - 1], zig_version, try target.query.zigTriple(builder.allocator) }));
5050
var m = Maker{
5151
.builder = builder,
5252
.target = target,
@@ -67,15 +67,15 @@ const Maker = struct {
6767

6868
fn obj(m: *const Maker, name: []const u8, src: []const u8) *Compile {
6969
const o = m.builder.addObject(.{ .name = name, .target = m.target, .optimize = m.optimize });
70-
if (o.target.getAbi() != .msvc)
70+
if (m.target.result.abi != .msvc)
7171
o.defineCMacro("_GNU_SOURCE", null);
7272

7373
if (std.mem.endsWith(u8, src, ".c")) {
74-
o.addCSourceFiles(&.{src}, m.cflags.items);
74+
o.addCSourceFiles(.{ .files = &.{src}, .flags = m.cflags.items });
7575
o.linkLibC();
7676
} else {
77-
o.addCSourceFiles(&.{src}, m.cxxflags.items);
78-
if (o.target.getAbi() == .msvc) {
77+
o.addCSourceFiles(.{ .files = &.{src}, .flags = m.cxxflags.items });
78+
if (m.target.result.abi == .msvc) {
7979
o.linkLibC(); // need winsdk + crt
8080
} else {
8181
// linkLibCpp already add (libc++ + libunwind + libc)
@@ -89,13 +89,13 @@ const Maker = struct {
8989

9090
fn exe(m: *const Maker, name: []const u8, src: []const u8, deps: []const *Compile) *Compile {
9191
const e = m.builder.addExecutable(.{ .name = name, .target = m.target, .optimize = m.optimize });
92-
e.addCSourceFiles(&.{src}, m.cxxflags.items);
92+
e.addCSourceFiles(.{ .files = &.{src}, .flags = m.cxxflags.items });
9393
for (deps) |d| e.addObject(d);
9494
for (m.objs.items) |o| e.addObject(o);
9595
for (m.include_dirs.items) |i| e.addIncludePath(.{ .path = i });
9696

9797
// https://github.com/ziglang/zig/issues/15448
98-
if (e.target.getAbi() == .msvc) {
98+
if (m.target.result.abi == .msvc) {
9999
e.linkLibC(); // need winsdk + crt
100100
} else {
101101
// linkLibCpp already add (libc++ + libunwind + libc)
@@ -107,7 +107,7 @@ const Maker = struct {
107107
}
108108
};
109109

110-
pub fn build(b: *std.build.Builder) !void {
110+
pub fn build(b: *std.Build) !void {
111111
var make = try Maker.init(b);
112112
make.enable_lto = b.option(bool, "lto", "Enable LTO optimization, (default: false)") orelse false;
113113

@@ -132,7 +132,7 @@ pub fn build(b: *std.build.Builder) !void {
132132
_ = make.exe("train-text-from-scratch", "examples/train-text-from-scratch/train-text-from-scratch.cpp", &.{ ggml, ggml_alloc, ggml_backend, ggml_quants, llama, common, buildinfo, train });
133133

134134
const server = make.exe("server", "examples/server/server.cpp", &.{ ggml, ggml_alloc, ggml_backend, ggml_quants, llama, common, buildinfo, sampling, grammar_parser, clip });
135-
if (server.target.isWindows()) {
135+
if (make.target.result.os.tag == .windows) {
136136
server.linkSystemLibrary("ws2_32");
137137
}
138138
}

0 commit comments

Comments
 (0)