authorgravatar for motiejus@jakstys.ltMotiejus Jakštys <motiejus@jakstys.lt> 2023-03-17 13:16:34+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-03-17 19:42:46-04:00
logc31007bb47a4d1d62917324a33e9a9a6cd1df5a6
tree9187fd174ddc99d0f8069f25394df3c3c261c755
parentf56f3c5824af17516bcf3a0559b98cdad20bd416

fix copy-paste errors

--sysroot was copy-pasted instead of --maxrss from above. Also, make it less likely in other places for this to be repeated. I found this by accident when reviewing f51413d2cf0bd87079dace7f6481d2a361a19ea6

1 files changed, 8 insertions(+), 8 deletions(-)

lib/build_runner.zig+8-8
...@@ -142,13 +142,13 @@ pub fn main() !void {...@@ -142,13 +142,13 @@ pub fn main() !void {
142 };142 };
143 } else if (mem.eql(u8, arg, "--sysroot")) {143 } else if (mem.eql(u8, arg, "--sysroot")) {
144 const sysroot = nextArg(args, &arg_idx) orelse {144 const sysroot = nextArg(args, &arg_idx) orelse {
145 std.debug.print("Expected argument after --sysroot\n\n", .{});145 std.debug.print("Expected argument after {s}\n\n", .{arg});
146 usageAndErr(builder, false, stderr_stream);146 usageAndErr(builder, false, stderr_stream);
147 };147 };
148 builder.sysroot = sysroot;148 builder.sysroot = sysroot;
149 } else if (mem.eql(u8, arg, "--maxrss")) {149 } else if (mem.eql(u8, arg, "--maxrss")) {
150 const max_rss_text = nextArg(args, &arg_idx) orelse {150 const max_rss_text = nextArg(args, &arg_idx) orelse {
151 std.debug.print("Expected argument after --sysroot\n\n", .{});151 std.debug.print("Expected argument after {s}\n\n", .{arg});
152 usageAndErr(builder, false, stderr_stream);152 usageAndErr(builder, false, stderr_stream);
153 };153 };
154 // TODO: support shorthand such as "2GiB", "2GB", or "2G"154 // TODO: support shorthand such as "2GiB", "2GB", or "2G"
...@@ -160,28 +160,28 @@ pub fn main() !void {...@@ -160,28 +160,28 @@ pub fn main() !void {
160 };160 };
161 } else if (mem.eql(u8, arg, "--search-prefix")) {161 } else if (mem.eql(u8, arg, "--search-prefix")) {
162 const search_prefix = nextArg(args, &arg_idx) orelse {162 const search_prefix = nextArg(args, &arg_idx) orelse {
163 std.debug.print("Expected argument after --search-prefix\n\n", .{});163 std.debug.print("Expected argument after {s}\n\n", .{arg});
164 usageAndErr(builder, false, stderr_stream);164 usageAndErr(builder, false, stderr_stream);
165 };165 };
166 builder.addSearchPrefix(search_prefix);166 builder.addSearchPrefix(search_prefix);
167 } else if (mem.eql(u8, arg, "--libc")) {167 } else if (mem.eql(u8, arg, "--libc")) {
168 const libc_file = nextArg(args, &arg_idx) orelse {168 const libc_file = nextArg(args, &arg_idx) orelse {
169 std.debug.print("Expected argument after --libc\n\n", .{});169 std.debug.print("Expected argument after {s}\n\n", .{arg});
170 usageAndErr(builder, false, stderr_stream);170 usageAndErr(builder, false, stderr_stream);
171 };171 };
172 builder.libc_file = libc_file;172 builder.libc_file = libc_file;
173 } else if (mem.eql(u8, arg, "--color")) {173 } else if (mem.eql(u8, arg, "--color")) {
174 const next_arg = nextArg(args, &arg_idx) orelse {174 const next_arg = nextArg(args, &arg_idx) orelse {
175 std.debug.print("expected [auto|on|off] after --color", .{});175 std.debug.print("Expected [auto|on|off] after {s}\n\n", .{arg});
176 usageAndErr(builder, false, stderr_stream);176 usageAndErr(builder, false, stderr_stream);
177 };177 };
178 color = std.meta.stringToEnum(Color, next_arg) orelse {178 color = std.meta.stringToEnum(Color, next_arg) orelse {
179 std.debug.print("expected [auto|on|off] after --color, found '{s}'", .{next_arg});179 std.debug.print("Expected [auto|on|off] after {s}, found '{s}'\n\n", .{ arg, next_arg });
180 usageAndErr(builder, false, stderr_stream);180 usageAndErr(builder, false, stderr_stream);
181 };181 };
182 } else if (mem.eql(u8, arg, "--zig-lib-dir")) {182 } else if (mem.eql(u8, arg, "--zig-lib-dir")) {
183 builder.zig_lib_dir = nextArg(args, &arg_idx) orelse {183 builder.zig_lib_dir = nextArg(args, &arg_idx) orelse {
184 std.debug.print("Expected argument after --zig-lib-dir\n\n", .{});184 std.debug.print("Expected argument after {s}\n\n", .{arg});
185 usageAndErr(builder, false, stderr_stream);185 usageAndErr(builder, false, stderr_stream);
186 };186 };
187 } else if (mem.eql(u8, arg, "--debug-log")) {187 } else if (mem.eql(u8, arg, "--debug-log")) {
...@@ -196,7 +196,7 @@ pub fn main() !void {...@@ -196,7 +196,7 @@ pub fn main() !void {
196 builder.debug_compile_errors = true;196 builder.debug_compile_errors = true;
197 } else if (mem.eql(u8, arg, "--glibc-runtimes")) {197 } else if (mem.eql(u8, arg, "--glibc-runtimes")) {
198 builder.glibc_runtimes_dir = nextArg(args, &arg_idx) orelse {198 builder.glibc_runtimes_dir = nextArg(args, &arg_idx) orelse {
199 std.debug.print("Expected argument after --glibc-runtimes\n\n", .{});199 std.debug.print("Expected argument after {s}\n\n", .{arg});
200 usageAndErr(builder, false, stderr_stream);200 usageAndErr(builder, false, stderr_stream);
201 };201 };
202 } else if (mem.eql(u8, arg, "--verbose-link")) {202 } else if (mem.eql(u8, arg, "--verbose-link")) {