diff options
Diffstat (limited to 'anim')
| -rw-r--r-- | anim/build.zig | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/anim/build.zig b/anim/build.zig index f410fb9..b693919 100644 --- a/anim/build.zig +++ b/anim/build.zig @@ -43,16 +43,9 @@ pub fn build(b: *std.Build) void { const embedded = b.addWriteFiles(); var table: std.ArrayList(u8) = .empty; - // The pass as ztrace's own build makes it. - // shortcut: its recipe is repeated here; the root package should name the plugin (`addNamedLazyPath`). - const cxx = b.addSystemCommand(&.{ "sh", "-c", "exec clang++ -shared -fPIC -O2 -fno-rtti $(llvm-config --cxxflags) \"$0\" -o \"$1\"" }); - cxx.addFileArg(zt.path("llvm/pass.cpp")); - const plugin = cxx.addOutputFileArg("ztrace-pass.so"); - // The agent to preload: of the two artifacts of that name, the shared one. - const agent = for (zt.builder.install_tls.step.dependencies.items) |step| { - const installed = step.cast(std.Build.Step.InstallArtifact) orelse continue; - if (std.mem.eql(u8, installed.artifact.name, "ztrace-agent") and installed.artifact.isDynamicLibrary()) break installed.artifact; - } else @panic("ztrace has no shared libztrace-agent"); + // The pass and the agent to preload, as ztrace's own build makes and names them. + const plugin = zt.namedLazyPath("ztrace-pass"); + const agent = zt.namedLazyPath("ztrace-agent"); const musl = b.resolveTargetQuery(.{ .cpu_arch = .x86_64, .os_tag = .linux, .abi = .musl }); const Recording = struct { @@ -108,7 +101,7 @@ pub fn build(b: *std.Build) void { if (r.instr != null) run.addArg("--ring"); if (r.alloc) { run.addArgs(&.{ "--alloc", "--preload" }); - run.addArtifactArg(agent); + run.addFileArg(agent); } run.addArg("-o"); const trace = run.addOutputFileArg(b.fmt("{s}.ztrace", .{r.name})); |
