diff options
| -rw-r--r-- | 9proc/build.zig | 10 | ||||
| -rw-r--r-- | build.zig | 21 |
2 files changed, 23 insertions, 8 deletions
diff --git a/9proc/build.zig b/9proc/build.zig index 43176d7..cf32886 100644 --- a/9proc/build.zig +++ b/9proc/build.zig @@ -21,9 +21,8 @@ pub const Context = struct { }; pub const Artifacts = struct { - /// The `9proc` module, exported with `b.addModule` so dependents of - /// cloud9 can `.module("9proc")`. Built for any target; the Linux - /// layer is compiled in only when the target OS is Linux. + /// The `9proc` module for `target`: the Linux layer is compiled in + /// only when the target OS is Linux. module: *std.Build.Module, /// The demo 9P2000 server (binary `9proc-demo`); null when the target is /// not Linux. 9ns's integration tests use it as their server. @@ -59,8 +58,9 @@ pub fn add(b: *std.Build, ctx: Context) Artifacts { build_options.addOption([]const u8, "target", target.result.zigTriple(b.allocator) catch "unknown"); // The library: freestanding core + vars, scratch (allocator), Linux layer. - // Exported under the name `9proc` for packages that depend on cloud9. - const lib_mod = b.addModule("9proc", .{ + // This copy is for `target`; packages that depend on cloud9 get the one + // the root exports, which has no target of its own. + const lib_mod = b.createModule(.{ .root_source_file = b.path("9proc/src/root.zig"), .target = target, .optimize = optimize, @@ -1,8 +1,23 @@ const std = @import("std"); pub fn build(b: *std.Build) void { + // Taken before the return only because pardes and sketchbook still + // pass `.target` and `.optimize`, which the exports ignore: undeclared, + // each configure of theirs would log "invalid option" for target, cpu + // and optimize with a stack trace (not fatal). Move both below the + // return once they pass nothing. const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); - const module = b.addModule("cloud9", .{ + // What a package that depends on cloud9 gets: the library and 9proc, + // with no target or optimize of their own (they take their importer's). + const cloud9 = b.addModule("cloud9", .{ .root_source_file = b.path("src/root.zig") }); + _ = b.addModule("9proc", .{ + .root_source_file = b.path("9proc/src/root.zig"), + .imports = &.{.{ .name = "cloud9", .module = cloud9 }}, + }); + // The rest is cloud9's own (tests, programs, and the fragments with + // the `jj` and `date` 9proc spawns), so a consumer's configure stops here. + if (!b.isRoot()) return; + const module = b.createModule(.{ .root_source_file = b.path("src/root.zig"), .target = target, .optimize = optimize, @@ -159,7 +174,7 @@ pub fn build(b: *std.Build) void { // add a directory, a fragment, a toggle here, and the path to // build.zig.zon. // - // -D9proc=[bool] library module (any target) + freestanding check; + // -D9proc=[bool] library tests + freestanding check; // demo server and Linux suites when the target is Linux // -D9ns=[bool] the FUSE mount CLI (Linux only) // @@ -167,7 +182,7 @@ pub fn build(b: *std.Build) void { // programs are installed by the plain `zig build` next to 9web // and cloud9-probe. const is_linux = target.result.os.tag == .linux; - const want_9proc = b.option(bool, "9proc", "Build the 9proc library module and demo (default: target is Linux)") orelse is_linux; + const want_9proc = b.option(bool, "9proc", "Build 9proc's tests, freestanding check and demo (default: target is Linux)") orelse is_linux; const want_9ns = b.option(bool, "9ns", "Build the 9ns FUSE mount CLI (default: target is Linux; Linux only)") orelse is_linux; const want_9agents = b.option(bool, "9agents", "Build the coding-agents fs daemon (default: target is Linux; Linux only)") orelse is_linux; if (want_9ns and !is_linux) { |
