Skip to content
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

Jump to bottom

Update build.zig for upstream API changes #632

Closed
wants to merge 1 commit into from
Closed

Update build.zig for upstream API changes #632

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 6 additions & 10 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@

const builtin = @import("builtin");
const std = @import("std");
const Path = std.Build.LazyPath;

// TODO: update to zig v0.12 final (when released)
const zig_min_required_version = "0.12.0-dev.2015";
const zig_min_required_version = "0.12.0-dev.3610";

// TODO: specify PACKAGE_VERSION and LIB*_VER_INFO.

Expand Down Expand Up @@ -441,7 +440,7 @@ pub fn build(b: *std.Build) void {
.files = source_files.items,
.flags = flags.items,
});
lib.addIncludePath(.{ .path = "include" });
lib.addIncludePath(b.path("include"));
lib.linkLibC();
if (install_headers) {
installHeader(b, lib, "gc.h");
Expand Down Expand Up @@ -513,10 +512,10 @@ fn addTest(b: *std.Build, lib: *std.Build.Step.Compile,
.target = lib.root_module.resolved_target.?
});
test_exe.addCSourceFile(.{
.file = Path.relative(filename),
.file = b.path(filename),
.flags = flags.items
});
test_exe.addIncludePath(.{ .path = "include" });
test_exe.addIncludePath(b.path("include"));
test_exe.linkLibrary(lib);
test_exe.linkLibC();
const run_test_exe = b.addRunArtifact(test_exe);
Expand All @@ -526,9 +525,6 @@ fn addTest(b: *std.Build, lib: *std.Build.Step.Compile,
fn installHeader(b: *std.Build, lib: *std.Build.Step.Compile,
hfile: []const u8) void {
const inc_path = "include/";
linusg marked this conversation as resolved.
Show resolved Hide resolved
const src_path = b.allocator.alloc(u8, inc_path.len + hfile.len)
catch @panic("OOM");
_ = std.fmt.bufPrint(src_path, "{s}{s}", .{ inc_path, hfile, })
catch @panic("Error joining paths");
lib.installHeader(src_path, hfile);
const src_path = b.pathJoin(&.{ inc_path, hfile });
lib.installHeader(b.path(src_path), hfile);
}
Loading