diff options
| author | Wojtek Mach <wojtek@wojtekmach.pl> | 2022-04-18 11:43:17 +0200 |
|---|---|---|
| committer | Wojtek Mach <wojtek@wojtekmach.pl> | 2022-04-18 11:43:17 +0200 |
| commit | b2344cc18e9fa5dfa1d19025caa2b0f583498734 (patch) | |
| tree | d0467a9995d9fdb8e21e040d608891aa94f21013 /src | |
| parent | 5eee8f70d1bff5504760f7080e1d50b91be4dc1c (diff) | |
| download | zig-b2344cc18e9fa5dfa1d19025caa2b0f583498734.tar.gz zig-b2344cc18e9fa5dfa1d19025caa2b0f583498734.zip | |
Support `--subsystem=x` instead of `--subsystem,x`
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.zig | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/main.zig b/src/main.zig index aec88c1175..e341a10f99 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1438,11 +1438,6 @@ fn buildOutputType( mem.eql(u8, linker_arg, "-static")) { force_static_libs = true; - } else if (mem.eql(u8, linker_arg, "--subsystem")) { - const next_arg = split_it.next() orelse { - fatal("expected parameter after {s}", .{linker_arg}); - }; - subsystem = try parseSubSystem(next_arg); } else { try linker_args.append(linker_arg); } @@ -1586,6 +1581,12 @@ fn buildOutputType( fatal("expected linker arg after '{s}'", .{arg}); } try rpath_list.append(linker_args.items[i]); + } else if (mem.eql(u8, arg, "--subsystem")) { + i += 1; + if (i >= linker_args.items.len) { + fatal("expected linker arg after '{s}'", .{arg}); + } + subsystem = try parseSubSystem(linker_args.items[i]); } else if (mem.eql(u8, arg, "-I") or mem.eql(u8, arg, "--dynamic-linker") or mem.eql(u8, arg, "-dynamic-linker")) |