| ... | @@ -1438,11 +1438,6 @@ fn buildOutputType( | ... | @@ -1438,11 +1438,6 @@ fn buildOutputType( |
| 1438 | mem.eql(u8, linker_arg, "-static")) | 1438 | mem.eql(u8, linker_arg, "-static")) |
| 1439 | { | 1439 | { |
| 1440 | force_static_libs = true; | 1440 | force_static_libs = true; |
| 1441 | } else if (mem.eql(u8, linker_arg, "--subsystem")) { | | |
| 1442 | const next_arg = split_it.next() orelse { | | |
| 1443 | fatal("expected parameter after {s}", .{linker_arg}); | | |
| 1444 | }; | | |
| 1445 | subsystem = try parseSubSystem(next_arg); | | |
| 1446 | } else { | 1441 | } else { |
| 1447 | try linker_args.append(linker_arg); | 1442 | try linker_args.append(linker_arg); |
| 1448 | } | 1443 | } |
| ... | @@ -1586,6 +1581,12 @@ fn buildOutputType( | ... | @@ -1586,6 +1581,12 @@ fn buildOutputType( |
| 1586 | fatal("expected linker arg after '{s}'", .{arg}); | 1581 | fatal("expected linker arg after '{s}'", .{arg}); |
| 1587 | } | 1582 | } |
| 1588 | try rpath_list.append(linker_args.items[i]); | 1583 | try rpath_list.append(linker_args.items[i]); |
| | 1584 | } else if (mem.eql(u8, arg, "--subsystem")) { |
| | 1585 | i += 1; |
| | 1586 | if (i >= linker_args.items.len) { |
| | 1587 | fatal("expected linker arg after '{s}'", .{arg}); |
| | 1588 | } |
| | 1589 | subsystem = try parseSubSystem(linker_args.items[i]); |
| 1589 | } else if (mem.eql(u8, arg, "-I") or | 1590 | } else if (mem.eql(u8, arg, "-I") or |
| 1590 | mem.eql(u8, arg, "--dynamic-linker") or | 1591 | mem.eql(u8, arg, "--dynamic-linker") or |
| 1591 | mem.eql(u8, arg, "-dynamic-linker")) | 1592 | mem.eql(u8, arg, "-dynamic-linker")) |
Wojtek Mach <wojtek@wojtekmach.pl> 2022-04-18 11:43:17+02:00
src