mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.Build.Compile: handle modules sans root source files

Browse Source 
Uses the new `-M[name][=src]` CLI syntax to omit the source when the
module does not have a zig root source file.

Only some kinds of link objects imply that this should happen.
This commit is contained in:
Andrew Kelley 2024-01-19 22:28:07 -07:00
parent 29cce62a25
commit 2dea375450
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/std/Build/Step/Compile.zig
View File

@ -1220,15 +1220,18 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
}
}
// The CLI assumes if it sees a --mod argument that it is a zig
// compilation unit. If there is no root source file, then this
// is not a zig compilation unit - it is perhaps a set of
// linker objects, or C source files instead.
// In such case, there will be only one module, so we can leave
// off the naming here.
// When the CLI sees a -M argument, it determines whether it
// implies the existence of a Zig compilation unit based on
// whether there is a root source file. If there is no root
// source file, then this is not a zig compilation unit - it is
// perhaps a set of linker objects, or C source files instead.
// Linker objects are added to the CLI globally, while C source
// files must have a module parent.
if (module.root_source_file) |lp| {
const src = lp.getPath2(module.owner, step);
try zig_args.appendSlice(&.{ "--mod", module_cli_name, src });
try zig_args.append(b.fmt("-M{s}={s}", .{ module_cli_name, src }));
} else if (moduleNeedsCliArg(module)) {
try zig_args.append(b.fmt("-M{s}", .{module_cli_name}));
}
}
}
@ -1850,3 +1853,10 @@ pub fn rootModuleTarget(c: *Compile) std.Target {
// The root module is always given a target, so we know this to be non-null.
return c.root_module.resolved_target.?.result;
}
fn moduleNeedsCliArg(mod: *const Module) bool {
return for (mod.link_objects.items) |o| switch (o) {
.c_source_file, .c_source_files, .assembly_file, .win32_resource_file => break true,
else => continue,
} else false;
}