mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-14 21:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't process.exit() on invalid option use .markInvalidUserInput

Browse Source
This commit is contained in:
daurnimator 2021-01-02 04:08:59 +11:00
parent ad1780959d
commit b3c9dfc9cc
No known key found for this signature in database
GPG Key ID: 45B429A8F9D9D22A
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/std/build.zig
View File

@ -653,7 +653,8 @@ pub const Builder = struct {
for (diags.arch.?.allCpuModels()) |cpu| {
warn(" {}\n", .{cpu.name});
}
process.exit(1);
self.markInvalidUserInput();
return args.default_target;
},
error.UnknownCpuFeature => {
warn(
@ -667,7 +668,8 @@ pub const Builder = struct {
for (diags.arch.?.allFeaturesList()) |feature| {
warn(" {}: {}\n", .{ feature.name, feature.description });
}
process.exit(1);
self.markInvalidUserInput();
return args.default_target;
},
error.UnknownOperatingSystem => {
warn(
@ -678,11 +680,13 @@ pub const Builder = struct {
inline for (std.meta.fields(std.Target.Os.Tag)) |field| {
warn(" {}\n", .{field.name});
}
process.exit(1);
self.markInvalidUserInput();
return args.default_target;
},
else => |e| {
warn("Unable to parse target '{}': {}\n", .{ triple, @errorName(e) });
process.exit(1);
self.markInvalidUserInput();
return args.default_target;
},
};
@ -703,9 +707,8 @@ pub const Builder = struct {
const t_triple = t.zigTriple(self.allocator) catch unreachable;
warn(" {}\n", .{t_triple});
}
// TODO instead of process exit, return error and have a zig build flag implemented by
// the build runner that turns process exits into error return traces
process.exit(1);
self.markInvalidUserInput();
return args.default_target;
}
return selected_target;