zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix straggling transitive dependencies

Browse source 
Helps hexops/mach#902

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2023-09-17 17:19:43 -07:00
parent 17dffd8966
commit 932a0a9979
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build.zig
View file

@ -89,6 +89,7 @@ fn testStep(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.C
pub const App = struct { pub const App = struct {
b: *std.Build, b: *std.Build,
mach_builder: *std.Build,
name: []const u8, name: []const u8,
compile: *std.build.Step.Compile, compile: *std.build.Step.Compile,
install: *std.build.Step.InstallArtifact, install: *std.build.Step.InstallArtifact,
@ -140,6 +141,7 @@ pub const App = struct {
return .{ return .{
.core = app, .core = app,
.b = app.b, .b = app.b,
.mach_builder = mach_builder,
.name = app.name, .name = app.name,
.compile = app.compile, .compile = app.compile,
.install = app.install, .install = app.install,
@ -149,14 +151,14 @@ pub const App = struct {
} }
pub fn link(app: *const App) !void { pub fn link(app: *const App) !void {
sysaudio.link(app.b.dependency("mach_sysaudio", .{ sysaudio.link(app.mach_builder.dependency("mach_sysaudio", .{
.target = app.compile.target, .target = app.compile.target,
.optimize = app.compile.optimize, .optimize = app.compile.optimize,
}).builder, app.compile); }).builder, app.compile);
// TODO: basisu support in wasm // TODO: basisu support in wasm
if (app.platform != .web) { if (app.platform != .web) {
app.compile.linkLibrary(app.b.dependency("mach_basisu", .{ app.compile.linkLibrary(app.mach_builder.dependency("mach_basisu", .{
.target = app.compile.target, .target = app.compile.target,
.optimize = app.compile.optimize, .optimize = app.compile.optimize,
}).artifact("mach-basisu")); }).artifact("mach-basisu"));