diff options
| -rw-r--r-- | src/main.cpp | 18 | ||||
| -rw-r--r-- | std/special/fmt_runner.zig | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/main.cpp b/src/main.cpp index 681cd6e8ac..35746319f8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -549,18 +549,20 @@ int main(int argc, char **argv) { codegen_build_and_link(g); - ZigList<const char*> args = {0}; + // TODO standardize os.cpp so that the args are supposed to have the exe + ZigList<const char*> args_with_exe = {0}; + ZigList<const char*> args_without_exe = {0}; + const char *exec_path = buf_ptr(&g->output_file_path); + args_with_exe.append(exec_path); for (int i = 2; i < argc; i += 1) { - args.append(argv[i]); + args_with_exe.append(argv[i]); + args_without_exe.append(argv[i]); } - args.append(nullptr); - const char *exec_path = buf_ptr(&g->output_file_path); - - os_execv(exec_path, args.items); + args_with_exe.append(nullptr); + os_execv(exec_path, args_with_exe.items); - args.pop(); Termination term; - os_spawn_process(exec_path, args, &term); + os_spawn_process(exec_path, args_without_exe, &term); return term.code; } diff --git a/std/special/fmt_runner.zig b/std/special/fmt_runner.zig index 46ced0e136..f0ed6704ed 100644 --- a/std/special/fmt_runner.zig +++ b/std/special/fmt_runner.zig @@ -37,7 +37,7 @@ pub fn main() !void { stderr = &stderr_out_stream.stream; const args = try std.os.argsAlloc(allocator); - var flags = try Args.parse(allocator, self_hosted_main.args_fmt_spec, args); + var flags = try Args.parse(allocator, self_hosted_main.args_fmt_spec, args[1..]); defer flags.deinit(); if (flags.present("help")) { |