| ... | @@ -256,31 +256,26 @@ pub fn main(init: process.Init.Minimal) !void { | ... | @@ -256,31 +256,26 @@ pub fn main(init: process.Init.Minimal) !void { |
| 256 | { | 256 | { |
| 257 | try cached_passthru_configure.append(arena, @intCast(configure_argv.items.len)); | 257 | try cached_passthru_configure.append(arena, @intCast(configure_argv.items.len)); |
| 258 | configure_argv.appendAssumeCapacity(arg); | 258 | configure_argv.appendAssumeCapacity(arg); |
| 259 | continue; | | |
| 260 | } else if (mem.eql(u8, arg, "--system")) { | 259 | } else if (mem.eql(u8, arg, "--system")) { |
| 261 | system_pkg_dir_path = nextArgOrFatal(args, &arg_i); | 260 | system_pkg_dir_path = nextArgOrFatal(args, &arg_i); |
| 262 | | 261 | |
| 263 | try cached_passthru_configure.append(arena, @intCast(configure_argv.items.len)); | 262 | try cached_passthru_configure.append(arena, @intCast(configure_argv.items.len)); |
| 264 | configure_argv.appendAssumeCapacity(arg); // Intentionally "--system" only; not the path. | 263 | configure_argv.appendAssumeCapacity(arg); // Intentionally "--system" only; not the path. |
| 265 | continue; | | |
| 266 | } else if (mem.cutPrefix(u8, arg, "--color=")) |rest| { | 264 | } else if (mem.cutPrefix(u8, arg, "--color=")) |rest| { |
| 267 | color = stringToEnum(Color, rest) orelse | 265 | color = stringToEnum(Color, rest) orelse |
| 268 | fatal("expected --color=[auto|on|off]; found {q}", .{arg}); | 266 | fatal("expected --color=[auto|on|off]; found {q}", .{arg}); |
| 269 | | 267 | |
| 270 | try cached_passthru_configure.append(arena, @intCast(configure_argv.items.len)); | 268 | try cached_passthru_configure.append(arena, @intCast(configure_argv.items.len)); |
| 271 | configure_argv.appendAssumeCapacity(arg); | 269 | configure_argv.appendAssumeCapacity(arg); |
| 272 | continue; | | |
| 273 | } else if (mem.eql(u8, arg, "--cache-poison")) { | 270 | } else if (mem.eql(u8, arg, "--cache-poison")) { |
| 274 | cache_poison = .poisoned; | 271 | cache_poison = .poisoned; |
| 275 | configure_argv.appendAssumeCapacity("--cache-poison=poisoned"); | 272 | configure_argv.appendAssumeCapacity("--cache-poison=poisoned"); |
| 276 | continue; | | |
| 277 | } else if (mem.cutPrefix(u8, arg, "--cache-poison=")) |rest| { | 273 | } else if (mem.cutPrefix(u8, arg, "--cache-poison=")) |rest| { |
| 278 | // Allow the configurer process to report parse failure. | 274 | // Allow the configurer process to report parse failure. |
| 279 | if (stringToEnum(std.Build.Graph.CachePoison, rest)) |poison| { | 275 | if (stringToEnum(std.Build.Graph.CachePoison, rest)) |poison| { |
| 280 | cache_poison = poison; | 276 | cache_poison = poison; |
| 281 | } | 277 | } |
| 282 | configure_argv.appendAssumeCapacity(arg); | 278 | configure_argv.appendAssumeCapacity(arg); |
| 283 | continue; | | |
| 284 | } else if (mem.eql(u8, arg, "--verbose")) { | 279 | } else if (mem.eql(u8, arg, "--verbose")) { |
| 285 | // Intentionally is added both to make and configure but | 280 | // Intentionally is added both to make and configure but |
| 286 | // does not go into the cache hash. | 281 | // does not go into the cache hash. |
| ... | @@ -291,7 +286,6 @@ pub fn main(init: process.Init.Minimal) !void { | ... | @@ -291,7 +286,6 @@ pub fn main(init: process.Init.Minimal) !void { |
| 291 | // the cache and configurer must set the poison bit when | 286 | // the cache and configurer must set the poison bit when |
| 292 | // choosing to observe it. | 287 | // choosing to observe it. |
| 293 | configure_argv.addManyAsArrayAssumeCapacity(2).* = .{ arg, prefix }; | 288 | configure_argv.addManyAsArrayAssumeCapacity(2).* = .{ arg, prefix }; |
| 294 | continue; | | |
| 295 | } else if (mem.eql(u8, arg, "--cache-dir")) { | 289 | } else if (mem.eql(u8, arg, "--cache-dir")) { |
| 296 | override_local_cache_dir = nextArgOrFatal(args, &arg_i); | 290 | override_local_cache_dir = nextArgOrFatal(args, &arg_i); |
| 297 | } else if (mem.eql(u8, arg, "--pkg-dir")) { | 291 | } else if (mem.eql(u8, arg, "--pkg-dir")) { |