Fix static linking using MinGW-w64

HertzDevil · Nov 6, 2024 · 211469d · 211469d
1 parent 650bb6d
commit 211469d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/crystal/system/win32/wmain.cr b/src/crystal/system/win32/wmain.cr
@@ -2,14 +2,12 @@ require "c/stringapiset"
 require "c/winnls"
 require "c/stdlib"
 
-{% begin %}
-  # we have both `main` and `wmain`, so we must choose an unambiguous entry point
+# we have both `main` and `wmain`, so we must choose an unambiguous entry point
+{% if flag?(:msvc) %}
   @[Link({{ flag?(:static) ? "libcmt" : "msvcrt" }})]
-  {% if flag?(:msvc) %}
-    @[Link(ldflags: "/ENTRY:wmainCRTStartup")]
-  {% elsif flag?(:gnu) && !flag?(:interpreted) %}
-    @[Link(ldflags: "-municode")]
-  {% end %}
+  @[Link(ldflags: "/ENTRY:wmainCRTStartup")]
+{% elsif flag?(:gnu) && !flag?(:interpreted) %}
+  @[Link(ldflags: "-municode")]
 {% end %}
 lib LibCrystalMain
 end

diff --git a/src/empty.cr b/src/empty.cr
@@ -1,6 +1,6 @@
 require "primitives"
 
-{% if flag?(:win32) %}
+{% if flag?(:msvc) %}
   @[Link({{ flag?(:static) ? "libcmt" : "msvcrt" }})] # For `mainCRTStartup`
 {% end %}
 lib LibCrystalMain

diff --git a/src/lib_c.cr b/src/lib_c.cr
@@ -1,5 +1,7 @@
-{% if flag?(:win32) %}
+{% if flag?(:msvc) %}
   @[Link({{ flag?(:static) ? "libucrt" : "ucrt" }})]
+{% elsif flag?(:win32) && flag?(:gnu) %}
+  @[Link(ldflags: "-mcrtdll=ucrt")]
 {% end %}
 lib LibC
   alias Char = UInt8