Skip to content

mingw: Rename mingw32.lib to libmingw32.lib. #23284

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

Merged
alexrp merged 1 commit into from
Mar 18, 2025
Merged

mingw: Rename mingw32.lib to libmingw32.lib. #23284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/Compilation.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ pub const MiscTask = enum {

@"mingw-w64 crt2.o",
@"mingw-w64 dllcrt2.o",
@"mingw-w64 mingw32.lib",
@"mingw-w64 libmingw32.lib",
};

pub const MiscError = struct {
Expand Down Expand Up @@ -1886,7 +1886,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil

const main_crt_file: mingw.CrtFile = if (is_dyn_lib) .dllcrt2_o else .crt2_o;
comp.queued_jobs.mingw_crt_file[@intFromEnum(main_crt_file)] = true;
comp.queued_jobs.mingw_crt_file[@intFromEnum(mingw.CrtFile.mingw32_lib)] = true;
comp.queued_jobs.mingw_crt_file[@intFromEnum(mingw.CrtFile.libmingw32_lib)] = true;
comp.remaining_prelink_tasks += 2;

// When linking mingw-w64 there are some import libs we always need.
Expand Down
2 changes: 1 addition & 1 deletion src/link/Coff.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2104,7 +2104,7 @@ fn linkWithLLD(coff: *Coff, arena: Allocator, tid: Zcu.PerThread.Id, prog_node:
try argv.append(try comp.crtFileAsString(arena, "crt2.obj"));
}

try argv.append(try comp.crtFileAsString(arena, "mingw32.lib"));
try argv.append(try comp.crtFileAsString(arena, "libmingw32.lib"));
} else {
const lib_str = switch (comp.config.link_mode) {
.dynamic => "",
Expand Down
6 changes: 3 additions & 3 deletions src/mingw.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const dev = @import("dev.zig");
pub const CrtFile = enum {
crt2_o,
dllcrt2_o,
mingw32_lib,
libmingw32_lib,
};

/// TODO replace anyerror with explicit error set, recording user-friendly errors with
Expand Down Expand Up @@ -69,7 +69,7 @@ pub fn buildCrtFile(comp: *Compilation, crt_file: CrtFile, prog_node: std.Progre
});
},

.mingw32_lib => {
.libmingw32_lib => {
var c_source_files = std.ArrayList(Compilation.CSourceFile).init(arena);

{
Expand Down Expand Up @@ -173,7 +173,7 @@ pub fn buildCrtFile(comp: *Compilation, crt_file: CrtFile, prog_node: std.Progre
}
}

return comp.build_crt_file("mingw32", .Lib, .@"mingw-w64 mingw32.lib", prog_node, c_source_files.items, .{
return comp.build_crt_file("libmingw32", .Lib, .@"mingw-w64 libmingw32.lib", prog_node, c_source_files.items, .{
.unwind_tables = unwind_tables,
// https://github.com/llvm/llvm-project/issues/43698#issuecomment-2542660611
.allow_lto = false,
Expand Down