mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 16:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

link: windows: look for more DLL import lib path names

Browse Source 
When linking with -lfoo syntax, this indicates to Zig that the
dependency should either be provided by Zig, or it should be dynamically
provided by the system.

For windows-gnu targets, the search path was "foo.lib". Now it
additionally looks for "libfoo.dll.a".

Closes #7799
This commit is contained in:
Andrew Kelley 2021-06-07 18:21:35 -07:00
parent 7ca86936ca
commit bfc85211bb
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/link/Coff.zig
View File

@ -1221,13 +1221,26 @@ fn linkWithLLD(self: *Coff, comp: *Compilation) !void {
try argv.append(comp.compiler_rt_static_lib.?.full_object_path); try argv.append(comp.compiler_rt_static_lib.?.full_object_path);
} }
try argv.ensureUnusedCapacity(self.base.options.system_libs.count());
for (self.base.options.system_libs.keys()) |key| { for (self.base.options.system_libs.keys()) |key| {
const lib_basename = try allocPrint(arena, "{s}.lib", .{key}); const lib_basename = try allocPrint(arena, "{s}.lib", .{key});
if (comp.crt_files.get(lib_basename)) |crt_file| { if (comp.crt_files.get(lib_basename)) |crt_file| {
try argv.append(crt_file.full_object_path); argv.appendAssumeCapacity(crt_file.full_object_path);
} else { continue;
try argv.append(lib_basename);
} }
if (try self.findLib(arena, lib_basename)) |full_path| {
argv.appendAssumeCapacity(full_path);
continue;
}
if (target.abi.isGnu()) {
const fallback_name = try allocPrint(arena, "lib{s}.dll.a", .{key});
if (try self.findLib(arena, fallback_name)) |full_path| {
argv.appendAssumeCapacity(full_path);
continue;
}
}
log.err("DLL import library for -l{s} not found", .{key});
return error.DllImportLibraryNotFound;
} }
if (self.base.options.verbose_link) { if (self.base.options.verbose_link) {
@ -1309,6 +1322,18 @@ fn linkWithLLD(self: *Coff, comp: *Compilation) !void {
} }
} }
fn findLib(self: *Coff, arena: *Allocator, name: []const u8) !?[]const u8 {
for (self.base.options.lib_dirs) |lib_dir| {
const full_path = try fs.path.join(arena, &.{ lib_dir, name });
fs.cwd().access(full_path, .{}) catch |err| switch (err) {
error.FileNotFound => continue,
else => |e| return e,
};
return full_path;
}
return null;
}
pub fn getDeclVAddr(self: *Coff, decl: *const Module.Decl) u64 { pub fn getDeclVAddr(self: *Coff, decl: *const Module.Decl) u64 {
assert(self.llvm_object == null); assert(self.llvm_object == null);
return self.text_section_virtual_address + decl.link.coff.text_offset; return self.text_section_virtual_address + decl.link.coff.text_offset;