aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkcbanner <kcbanner@gmail.com>2022-11-08 02:14:39 -0500
committerkcbanner <kcbanner@gmail.com>2023-01-04 21:45:05 -0500
commit0471eea0e2cac49946449efe4698d5ac18c0dc0d (patch)
treef1d6d3a29e16d952380c3b0ea498d9cc65cf0d07 /src
parentc3945d9edeb304ccd9f3d44e9ab0bf94f5420694 (diff)
downloadzig-0471eea0e2cac49946449efe4698d5ac18c0dc0d.tar.gz
zig-0471eea0e2cac49946449efe4698d5ac18c0dc0d.zip
build: first pass on geting stage3 building under x64_64-windows-msvc
Diffstat (limited to 'src')
-rw-r--r--src/Compilation.zig4
-rw-r--r--src/link/Coff/lld.zig6
2 files changed, 8 insertions, 2 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig
index e365d1dab2..eeecf58751 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -3297,8 +3297,8 @@ fn processOneJob(comp: *Compilation, job: Job) !void {
// TODO Surface more error details.
comp.lockAndSetMiscFailure(
.windows_import_lib,
- "unable to generate DLL import .lib file: {s}",
- .{@errorName(err)},
+ "unable to generate DLL import .lib file for {s}: {s}",
+ .{link_lib, @errorName(err)},
);
};
},
diff --git a/src/link/Coff/lld.zig b/src/link/Coff/lld.zig
index 46b0130542..dfa56527bf 100644
--- a/src/link/Coff/lld.zig
+++ b/src/link/Coff/lld.zig
@@ -486,6 +486,12 @@ pub fn linkWithLLD(self: *Coff, comp: *Compilation, prog_node: *std.Progress.Nod
continue;
}
}
+ if (target.abi == .msvc) { // TODO: Do this at the top, if we detect we're using the native libc?
+ log.warn("adding system lib {s}", .{ lib_basename });
+ argv.appendAssumeCapacity(lib_basename);
+ continue;
+ }
+
log.err("DLL import library for -l{s} not found", .{key});
return error.DllImportLibraryNotFound;
}