diff options
| author | emekoi <emekankurumeh@outlook.com> | 2019-05-25 14:25:46 -0500 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-05-27 22:15:33 -0400 |
| commit | 3f302594b855e4d0dff9fbbfb2fe9d1d1801cb6e (patch) | |
| tree | 97e13c675e77d6f93a018dfdcbea2df3bee09fa9 /src | |
| parent | f924fbddcfb615014aa7527686c1651c6e4d7846 (diff) | |
| download | zig-3f302594b855e4d0dff9fbbfb2fe9d1d1801cb6e.tar.gz zig-3f302594b855e4d0dff9fbbfb2fe9d1d1801cb6e.zip | |
respect subsystem flag in all cases
Diffstat (limited to 'src')
| -rw-r--r-- | src/analyze.cpp | 6 | ||||
| -rw-r--r-- | src/codegen.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/analyze.cpp b/src/analyze.cpp index d6396832c4..0c629d6752 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -2711,12 +2711,12 @@ void add_fn_export(CodeGen *g, ZigFn *fn_table_entry, Buf *symbol_name, GlobalLi if (ccc) { if (buf_eql_str(symbol_name, "main") && g->libc_link_lib != nullptr) { g->have_c_main = true; - g->subsystem = TargetSubsystemConsole; + g->subsystem = g->subsystem == TargetSubsystemAuto ? TargetSubsystemConsole : g->subsystem; } else if (buf_eql_str(symbol_name, "WinMain") && g->zig_target->os == OsWindows) { g->have_winmain = true; - g->subsystem = TargetSubsystemWindows; + g->subsystem = g->subsystem == TargetSubsystemAuto ? TargetSubsystemWindows : g->subsystem; } else if (buf_eql_str(symbol_name, "WinMainCRTStartup") && g->zig_target->os == OsWindows) { @@ -3937,7 +3937,7 @@ ZigType *add_source_file(CodeGen *g, ZigPackage *package, Buf *resolved_path, Bu if (is_pub) { if (buf_eql_str(proto_name, "main")) { g->have_pub_main = true; - g->subsystem = TargetSubsystemConsole; + g->subsystem = g->subsystem == TargetSubsystemAuto ? TargetSubsystemConsole : g->subsystem; } else if (buf_eql_str(proto_name, "panic")) { g->have_pub_panic = true; } diff --git a/src/codegen.cpp b/src/codegen.cpp index 6b6564ffba..54e9c44f92 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -7998,7 +7998,7 @@ static void init(CodeGen *g) { } if (g->is_test_build) { - g->subsystem = TargetSubsystemConsole; + g->subsystem = g->subsystem == TargetSubsystemAuto ? TargetSubsystemConsole : g->subsystem; } assert(g->root_out_name); |