Commit 99922c2708bbbda4fcdc16a45a5d3071dd1495c0 | zig

author	Andrew Kelley <andrew@ziglang.org> 2024-01-07 22:16:00-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-01-08 11:52:38-07:00
log	99922c2708bbbda4fcdc16a45a5d3071dd1495c0
tree	589ade28a4210ecd142ebc5497e2e7d846b49ca4
parent	089ebeb8736e9186c14d8228fa5594c518dcdb4b

Compilation: only add __MSVCRT_VERSION__ for -lc

prevents it from being defined twice when building mingw-w64 libs.

1 files changed, 13 insertions(+), 9 deletions(-)

src
- Compilation.zig

src/Compilation.zig+13-9

 @@ -5086,12 +5086,17 @@ pub fn addCCArgs(
         try argv.append(libunwind_include_path);
     }
-    if (comp.config.link_libc and target.isGnuLibC()) {
+    if (comp.config.link_libc) {
-        const target_version = target.os.version_range.linux.glibc;
+        if (target.isGnuLibC()) {
-        const glibc_minor_define = try std.fmt.allocPrint(arena, "-D__GLIBC_MINOR__={d}", .{
+            const target_version = target.os.version_range.linux.glibc;
-            target_version.minor,
+            const glibc_minor_define = try std.fmt.allocPrint(arena, "-D__GLIBC_MINOR__={d}", .{
-        });
+                target_version.minor,
-        try argv.append(glibc_minor_define);
+            });
+            try argv.append(glibc_minor_define);
+        } else if (target.isMinGW()) {
+            try argv.append("-D__MSVCRT_VERSION__=0xE00"); // use ucrt
+        }
     }
     const llvm_triple = try @import("codegen/llvm.zig").targetTriple(arena, target);
 @@ -5100,10 +5105,9 @@ pub fn addCCArgs(
     if (target.os.tag == .windows) switch (ext) {
         .c, .cpp, .m, .mm, .h, .cu, .rc, .assembly, .assembly_with_cpp => {
             const minver: u16 = @truncate(@intFromEnum(target.os.getVersionRange().windows.min) >> 16);
-            try argv.appendSlice(&.{
+            try argv.append(
                 try std.fmt.allocPrint(arena, "-D_WIN32_WINNT=0x{x:0>4}", .{minver}),
-                "-D__MSVCRT_VERSION__=0xE00", // use ucrt
+            );
-            });
         },
         else => {},
     };