authorgravatar for emekankurumeh@outlook.comemekoi <emekankurumeh@outlook.com> 2019-05-25 14:25:46-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-05-27 22:15:33-04:00
log3f302594b855e4d0dff9fbbfb2fe9d1d1801cb6e
tree97e13c675e77d6f93a018dfdcbea2df3bee09fa9
parentf924fbddcfb615014aa7527686c1651c6e4d7846

respect subsystem flag in all cases

2 files changed, 4 insertions(+), 4 deletions(-)

src/analyze.cpp+3-3
......@@ -2711,12 +2711,12 @@ void add_fn_export(CodeGen *g, ZigFn *fn_table_entry, Buf *symbol_name, GlobalLi
27112711 if (ccc) {
27122712 if (buf_eql_str(symbol_name, "main") && g->libc_link_lib != nullptr) {
27132713 g->have_c_main = true;
2714 g->subsystem = TargetSubsystemConsole;
2714 g->subsystem = g->subsystem == TargetSubsystemAuto ? TargetSubsystemConsole : g->subsystem;
27152715 } else if (buf_eql_str(symbol_name, "WinMain") &&
27162716 g->zig_target->os == OsWindows)
27172717 {
27182718 g->have_winmain = true;
2719 g->subsystem = TargetSubsystemWindows;
2719 g->subsystem = g->subsystem == TargetSubsystemAuto ? TargetSubsystemWindows : g->subsystem;
27202720 } else if (buf_eql_str(symbol_name, "WinMainCRTStartup") &&
27212721 g->zig_target->os == OsWindows)
27222722 {
......@@ -3937,7 +3937,7 @@ ZigType *add_source_file(CodeGen *g, ZigPackage *package, Buf *resolved_path, Bu
39373937 if (is_pub) {
39383938 if (buf_eql_str(proto_name, "main")) {
39393939 g->have_pub_main = true;
3940 g->subsystem = TargetSubsystemConsole;
3940 g->subsystem = g->subsystem == TargetSubsystemAuto ? TargetSubsystemConsole : g->subsystem;
39413941 } else if (buf_eql_str(proto_name, "panic")) {
39423942 g->have_pub_panic = true;
39433943 }
src/codegen.cpp+1-1
......@@ -7998,7 +7998,7 @@ static void init(CodeGen *g) {
79987998 }
79997999
80008000 if (g->is_test_build) {
8001 g->subsystem = TargetSubsystemConsole;
8001 g->subsystem = g->subsystem == TargetSubsystemAuto ? TargetSubsystemConsole : g->subsystem;
80028002 }
80038003
80048004 assert(g->root_out_name);