motiejus/zig
1
Fork 0
Code Releases Activity

Compilation: only add __MSVCRT_VERSION__ for -lc

Browse Source 
prevents it from being defined twice when building mingw-w64 libs.
This commit is contained in:
Andrew Kelley
2024-01-07 22:16:00 -07:00
parent 089ebeb873
commit 99922c2708
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Compilation.zig
View File

@@ -5086,12 +5086,17 @@ pub fn addCCArgs(
try argv.append(libunwind_include_path);
}
if (comp.config.link_libc and target.isGnuLibC()) {
const target_version = target.os.version_range.linux.glibc;
const glibc_minor_define = try std.fmt.allocPrint(arena, "-D__GLIBC_MINOR__={d}", .{
target_version.minor,
});
try argv.append(glibc_minor_define);
if (comp.config.link_libc) {
if (target.isGnuLibC()) {
const target_version = target.os.version_range.linux.glibc;
const glibc_minor_define = try std.fmt.allocPrint(arena, "-D__GLIBC_MINOR__={d}", .{
target_version.minor,
});
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 => {},
};