diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2024-01-20 12:01:33 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-20 12:01:33 -0800 |
| commit | 10aff6750275bda834579b0b2daef14287d50438 (patch) | |
| tree | fec4935c2bdde0355c9b02d6644adf8f8b5204d8 /src/Compilation.zig | |
| parent | 1b8f7e46fa33cda57caf39c5a5a0f5f52335a99b (diff) | |
| parent | 398ab5fcfb1de7cbf340ab14f4b8d835250dbb2a (diff) | |
| download | zig-10aff6750275bda834579b0b2daef14287d50438.tar.gz zig-10aff6750275bda834579b0b2daef14287d50438.zip | |
Merge pull request #18596 from ypsvlq/mingw
mingw-w64: add missing CRT sources
Diffstat (limited to 'src/Compilation.zig')
| -rw-r--r-- | src/Compilation.zig | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 803378a665..171c2ecf60 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -758,10 +758,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", }; pub const MiscError = struct { @@ -1818,14 +1815,9 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil if (comp.wantBuildMinGWFromSource()) { if (!target_util.canBuildLibC(target)) return error.LibCUnavailable; - const static_lib_jobs = [_]Job{ - .{ .mingw_crt_file = .mingw32_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); + try comp.work_queue.ensureUnusedCapacity(2); + comp.work_queue.writeItemAssumeCapacity(.{ .mingw_crt_file = .mingwex_lib }); comp.work_queue.writeItemAssumeCapacity(crt_job); // When linking mingw-w64 there are some import libs we always need. |