diff options
| author | Elaine Gibson <ypsvlq@gmail.com> | 2024-01-17 01:57:31 +0000 |
|---|---|---|
| committer | Elaine Gibson <ypsvlq@gmail.com> | 2024-01-20 00:24:39 +0000 |
| commit | 398ab5fcfb1de7cbf340ab14f4b8d835250dbb2a (patch) | |
| tree | 345fda8120809269f72a8b7d8e85a04127b4cb28 /src/Compilation.zig | |
| parent | b1269785557074ce249666ff922a47ae1d384769 (diff) | |
| download | zig-398ab5fcfb1de7cbf340ab14f4b8d835250dbb2a.tar.gz zig-398ab5fcfb1de7cbf340ab14f4b8d835250dbb2a.zip | |
mingw: update build logic
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 8b6c7abbad..95946130f4 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 { @@ -1816,14 +1813,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. |