From 8db4d2332e62ba31412b28e725f4c4ae3b7dd801 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 3 Dec 2019 13:10:26 -0500 Subject: [PATCH] correct startup logic for exporting libc main --- lib/std/special/start.zig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/std/special/start.zig b/lib/std/special/start.zig index 5d168490fc..c483fda756 100644 --- a/lib/std/special/start.zig +++ b/lib/std/special/start.zig @@ -24,10 +24,10 @@ comptime { @export("_DllMainCRTStartup", _DllMainCRTStartup, .Strong); } } else if (builtin.output_mode == .Exe or @hasDecl(root, "main")) { - if (builtin.link_libc and @hasDecl(root, "main") and - @typeInfo(@typeOf(root.main)).Fn.calling_convention != .C) - { - @export("main", main, .Weak); + if (builtin.link_libc and @hasDecl(root, "main")) { + if (@typeInfo(@typeOf(root.main)).Fn.calling_convention != .C) { + @export("main", main, .Weak); + } } else if (builtin.os == .windows) { if (!@hasDecl(root, "WinMain") and !@hasDecl(root, "WinMainCRTStartup")) { @export("WinMainCRTStartup", WinMainCRTStartup, .Strong);