diff options
| author | Elaine Gibson <ypsvlq@gmail.com> | 2024-03-23 08:03:41 +0000 |
|---|---|---|
| committer | Elaine Gibson <ypsvlq@gmail.com> | 2024-03-27 10:05:57 +0000 |
| commit | add74427b9adc9e1b0d39a0fba9d001c0953a659 (patch) | |
| tree | 2baa8bfa654870e90928280441cbd3efc8cb9f02 /src/Compilation.zig | |
| parent | 71d878ba5051dd7bb3db15dcfba0f70cff3c225e (diff) | |
| download | zig-add74427b9adc9e1b0d39a0fba9d001c0953a659.tar.gz zig-add74427b9adc9e1b0d39a0fba9d001c0953a659.zip | |
mingw: support -municode
Diffstat (limited to 'src/Compilation.zig')
| -rw-r--r-- | src/Compilation.zig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 5bbca51ede..003ecb8e28 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -173,6 +173,7 @@ global_cache_directory: Directory, libc_include_dir_list: []const []const u8, libc_framework_dir_list: []const []const u8, rc_includes: RcIncludes, +mingw_unicode_entry_point: bool, thread_pool: *ThreadPool, /// Populated when we build the libc++ static library. A Job to build this is placed in the queue @@ -758,7 +759,7 @@ pub const MiscTask = enum { @"mingw-w64 crt2.o", @"mingw-w64 dllcrt2.o", - @"mingw-w64 mingwex.lib", + @"mingw-w64 mingw32.lib", }; pub const MiscError = struct { @@ -1101,6 +1102,7 @@ pub const CreateOptions = struct { test_name_prefix: ?[]const u8 = null, test_runner_path: ?[]const u8 = null, subsystem: ?std.Target.SubSystem = null, + mingw_unicode_entry_point: bool = false, /// (Zig compiler development) Enable dumping linker's state as JSON. enable_link_snapshots: bool = false, /// (Darwin) Install name of the dylib @@ -1427,6 +1429,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil .libc_include_dir_list = libc_dirs.libc_include_dir_list, .libc_framework_dir_list = libc_dirs.libc_framework_dir_list, .rc_includes = options.rc_includes, + .mingw_unicode_entry_point = options.mingw_unicode_entry_point, .thread_pool = options.thread_pool, .clang_passthrough_mode = options.clang_passthrough_mode, .clang_preprocessor_mode = options.clang_preprocessor_mode, @@ -1768,7 +1771,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil const crt_job: Job = .{ .mingw_crt_file = if (is_dyn_lib) .dllcrt2_o else .crt2_o }; try comp.work_queue.ensureUnusedCapacity(2); - comp.work_queue.writeItemAssumeCapacity(.{ .mingw_crt_file = .mingwex_lib }); + comp.work_queue.writeItemAssumeCapacity(.{ .mingw_crt_file = .mingw32_lib }); comp.work_queue.writeItemAssumeCapacity(crt_job); // When linking mingw-w64 there are some import libs we always need. |