Skip to content

mingw: build all CRT libraries #16273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

mingw: build all CRT libraries #16273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd01497
tools: add mingw update script
ypsvlq Jun 30, 2023
320a094
mingw: build all CRT libraries
ypsvlq Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions src/Compilation.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,10 +367,7 @@ pub const MiscTask = enum {

@"mingw-w64 crt2.o",
@"mingw-w64 dllcrt2.o",
@"mingw-w64 mingw32.lib",
@"mingw-w64 msvcrt-os.lib",
@"mingw-w64 mingwex.lib",
@"mingw-w64 uuid.lib",
@"mingw-w64 CRT lib",
};

pub const MiscError = struct {
Expand Down Expand Up @@ -1702,16 +1699,21 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
if (comp.wantBuildMinGWFromSource()) {
if (!target_util.canBuildLibC(target)) return error.LibCUnavailable;

const static_lib_jobs = [_]Job{
.{ .mingw_crt_file = .mingw32_lib },
.{ .mingw_crt_file = .msvcrt_os_lib },
.{ .mingw_crt_file = .mingwex_lib },
.{ .mingw_crt_file = .uuid_lib },
};
const crt_job: Job = .{ .mingw_crt_file = if (is_dyn_lib) .dllcrt2_o else .crt2_o };
try comp.work_queue.ensureUnusedCapacity(static_lib_jobs.len + 1);
comp.work_queue.writeAssumeCapacity(&static_lib_jobs);
comp.work_queue.writeItemAssumeCapacity(crt_job);
try comp.work_queue.writeItem(crt_job);

var add_libc = true;
var it = comp.bin_file.options.system_libs.iterator();
while (it.next()) |entry| {
const name = entry.key_ptr.*;
if (std.mem.startsWith(u8, name, "msvcr") or std.mem.startsWith(u8, name, "ucrt") or std.mem.startsWith(u8, name, "crtdll")) {
add_libc = false;
break;
}
}
if (add_libc) {
try comp.bin_file.options.system_libs.put(comp.gpa, "ucrt", .{ .needed = true, .weak = false, .path = null });
}

// When linking mingw-w64 there are some import libs we always need.
for (mingw.always_link_libs) |name| {
Expand All @@ -1721,6 +1723,8 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
.path = null,
});
}

try mingw.processSystemLibs(comp);
}
// Generate Windows import libs.
if (target.os.tag == .windows) {
Expand Down
5 changes: 0 additions & 5 deletions src/link/Coff/lld.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,6 @@ pub fn linkWithLLD(self: *Coff, comp: *Compilation, prog_node: *std.Progress.Nod
try argv.append(try comp.get_libc_crt_file(arena, "crt2.obj"));
}

try argv.append(try comp.get_libc_crt_file(arena, "mingw32.lib"));
try argv.append(try comp.get_libc_crt_file(arena, "mingwex.lib"));
try argv.append(try comp.get_libc_crt_file(arena, "msvcrt-os.lib"));
try argv.append(try comp.get_libc_crt_file(arena, "uuid.lib"));

for (mingw.always_link_libs) |name| {
if (!self.base.options.system_libs.contains(name)) {
const lib_basename = try allocPrint(arena, "{s}.lib", .{name});
Expand Down
Loading