authorgravatar for emekankurumeh@outlook.comemekoi <emekankurumeh@outlook.com> 2019-05-10 09:48:32-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-05-29 16:55:01-04:00
log6bc5b07e3e24871fc81ddd5a3780523bf95cf8d5
tree09c92a4731eb380da1995f105884a7caebad06b6
parentfb5dc2892171b4f9f14460844b67163b5aa4d269
signature Commit is signed but in an unrecognized format.

try to resolve TargetSubSystemAuto to actual subsystem

1 files changed, 14 insertions(+), 5 deletions(-)

src/codegen.cpp+14-5
......@@ -7872,7 +7872,6 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {
78727872 {
78737873 buf_appendf(contents,
78747874 "pub const SubSystem = enum {\n"
7875 " Auto,\n"
78767875 " Console,\n"
78777876 " Windows,\n"
78787877 " Posix,\n"
......@@ -7883,7 +7882,6 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {
78837882 " EfiRuntimeDriver,\n"
78847883 "};\n\n");
78857884
7886 assert(TargetSubsystemAuto == 0);
78877885 assert(TargetSubsystemConsole == 1);
78887886 assert(TargetSubsystemWindows == 2);
78897887 assert(TargetSubsystemPosix == 3);
......@@ -7911,7 +7909,6 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {
79117909
79127910 {
79137911 static const char* subsystem_strings[] = {
7914 "Auto",
79157912 "Console",
79167913 "Windows",
79177914 "Posix",
......@@ -7921,7 +7918,19 @@ Buf *codegen_generate_builtin_source(CodeGen *g) {
79217918 "EfiRom",
79227919 "EfiRuntimeDriver",
79237920 };
7924 buf_appendf(contents, "pub const subsystem = SubSystem.%s;\n", subsystem_strings[g->subsystem]);
7921
7922 if (g->subsystem == TargetSubsystemAuto) {
7923 if (g->have_c_main || g->have_pub_main) {
7924 buf_appendf(contents, "pub const subsystem = SubSystem.%s;\n", subsystem_strings[TargetSubsystemConsole - 1]);
7925 } else if (g->have_winmain || g->have_winmain_crt_startup) {
7926 buf_appendf(contents, "pub const subsystem = SubSystem.%s;\n", subsystem_strings[TargetSubsystemWindows - 1]);
7927 } else if (g->have_dllmain_crt_startup || g->out_type == OutTypeLib) {
7928 buf_appendf(contents, "pub const subsystem = null;\n");
7929 }
7930 } else {
7931 buf_appendf(contents, "pub const subsystem = SubSystem.%s;\n", subsystem_strings[g->subsystem - 1]);
7932 }
7933
79257934 }
79267935
79277936 if (g->is_test_build) {
......@@ -7967,7 +7976,7 @@ static Error define_builtin_compile_vars(CodeGen *g) {
79677976 cache_bool(&cache_hash, g->have_err_ret_tracing);
79687977 cache_bool(&cache_hash, g->libc_link_lib != nullptr);
79697978 cache_bool(&cache_hash, g->valgrind_support);
7970 cache_int(&cache_hash, g->subsystem);
7979 cache_int(&cache_hash, g->subsystem - 1);
79717980
79727981 Buf digest = BUF_INIT;
79737982 buf_resize(&digest, 0);