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

Extract getZigArgs function in std.Build.Step.Compile

Browse Source
This commit is contained in:
Sashko 2024-03-12 09:08:03 +01:00 committed by Andrew Kelley
parent cb308ba3ac
commit 604a332e21
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -989,10 +989,10 @@ fn getGeneratedFilePath(compile: *Compile, comptime tag_name: []const u8, asking
return path; return path;
} }
fn make(step: *Step, prog_node: std.Progress.Node) !void { fn getZigArgs(compile: *Compile) ![][]const u8 {
const step = &compile.step;
const b = step.owner; const b = step.owner;
const arena = b.allocator; const arena = b.allocator;
const compile: *Compile = @fieldParentPtr("step", step);
var zig_args = ArrayList([]const u8).init(arena); var zig_args = ArrayList([]const u8).init(arena);
defer zig_args.deinit(); defer zig_args.deinit();
@ -1298,6 +1298,7 @@ fn make(step: *Step, prog_node: std.Progress.Node) !void {
// We need to emit the --mod argument here so that the above link objects // We need to emit the --mod argument here so that the above link objects
// have the correct parent module, but only if the module is part of // have the correct parent module, but only if the module is part of
// this compilation. // this compilation.
if (!my_responsibility) continue;
if (cli_named_modules.modules.getIndex(dep.module)) |module_cli_index| { if (cli_named_modules.modules.getIndex(dep.module)) |module_cli_index| {
const module_cli_name = cli_named_modules.names.keys()[module_cli_index]; const module_cli_name = cli_named_modules.names.keys()[module_cli_index];
try dep.module.appendZigProcessFlags(&zig_args, step); try dep.module.appendZigProcessFlags(&zig_args, step);
@ -1724,7 +1725,16 @@ fn make(step: *Step, prog_node: std.Progress.Node) !void {
try zig_args.append(resolved_args_file); try zig_args.append(resolved_args_file);
} }
const maybe_output_bin_path = step.evalZigProcess(zig_args.items, prog_node) catch |err| switch (err) { return try zig_args.toOwnedSlice();
}
fn make(step: *Step, prog_node: std.Progress.Node) !void {
const b = step.owner;
const compile: *Compile = @fieldParentPtr("step", step);
const zig_args = try getZigArgs(compile);
const maybe_output_bin_path = step.evalZigProcess(zig_args, prog_node) catch |err| switch (err) {
error.NeedCompileErrorCheck => { error.NeedCompileErrorCheck => {
assert(compile.expect_errors != null); assert(compile.expect_errors != null);
try checkCompileErrors(compile); try checkCompileErrors(compile);