From 5eee8f70d1bff5504760f7080e1d50b91be4dc1c Mon Sep 17 00:00:00 2001 From: Wojtek Mach Date: Wed, 6 Apr 2022 22:48:07 +0200 Subject: [PATCH 1/2] zig cc: support --subsystem linker flag Example: $ zig cc -o main.exe main.cpp -target x86_64-windows -Wl,--subsystem,windows --- src/main.zig | 69 +++++++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/src/main.zig b/src/main.zig index a647216b05..aec88c1175 100644 --- a/src/main.zig +++ b/src/main.zig @@ -849,36 +849,7 @@ fn buildOutputType( const next_arg = args_iter.next() orelse { fatal("expected parameter after {s}", .{arg}); }; - if (mem.eql(u8, next_arg, "console")) { - subsystem = .Console; - } else if (mem.eql(u8, next_arg, "windows")) { - subsystem = .Windows; - } else if (mem.eql(u8, next_arg, "posix")) { - subsystem = .Posix; - } else if (mem.eql(u8, next_arg, "native")) { - subsystem = .Native; - } else if (mem.eql(u8, next_arg, "efi_application")) { - subsystem = .EfiApplication; - } else if (mem.eql(u8, next_arg, "efi_boot_service_driver")) { - subsystem = .EfiBootServiceDriver; - } else if (mem.eql(u8, next_arg, "efi_rom")) { - subsystem = .EfiRom; - } else if (mem.eql(u8, next_arg, "efi_runtime_driver")) { - subsystem = .EfiRuntimeDriver; - } else { - fatal("invalid: --subsystem: '{s}'. Options are:\n{s}", .{ - next_arg, - \\ console - \\ windows - \\ posix - \\ native - \\ efi_application - \\ efi_boot_service_driver - \\ efi_rom - \\ efi_runtime_driver - \\ - }); - } + subsystem = try parseSubSystem(next_arg); } else if (mem.eql(u8, arg, "-O")) { optimize_mode_string = args_iter.next() orelse { fatal("expected parameter after {s}", .{arg}); @@ -1467,6 +1438,11 @@ 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); } @@ -5132,3 +5108,36 @@ fn warnAboutForeignBinaries( }, } } + +fn parseSubSystem(next_arg: []const u8) !std.Target.SubSystem { + if (mem.eql(u8, next_arg, "console")) { + return .Console; + } else if (mem.eql(u8, next_arg, "windows")) { + return .Windows; + } else if (mem.eql(u8, next_arg, "posix")) { + return .Posix; + } else if (mem.eql(u8, next_arg, "native")) { + return .Native; + } else if (mem.eql(u8, next_arg, "efi_application")) { + return .EfiApplication; + } else if (mem.eql(u8, next_arg, "efi_boot_service_driver")) { + return .EfiBootServiceDriver; + } else if (mem.eql(u8, next_arg, "efi_rom")) { + return .EfiRom; + } else if (mem.eql(u8, next_arg, "efi_runtime_driver")) { + return .EfiRuntimeDriver; + } else { + fatal("invalid: --subsystem: '{s}'. Options are:\n{s}", .{ + next_arg, + \\ console + \\ windows + \\ posix + \\ native + \\ efi_application + \\ efi_boot_service_driver + \\ efi_rom + \\ efi_runtime_driver + \\ + }); + } +} From b2344cc18e9fa5dfa1d19025caa2b0f583498734 Mon Sep 17 00:00:00 2001 From: Wojtek Mach Date: Mon, 18 Apr 2022 11:43:17 +0200 Subject: [PATCH 2/2] Support `--subsystem=x` instead of `--subsystem,x` --- src/main.zig | 11 ++++++----- 1 file 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"))