diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-08-30 15:55:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 15:55:05 -0400 |
| commit | f559ea95b1c37fd6ede8fff6ffb2d74d5c2abc4e (patch) | |
| tree | 6d9714e54fa2223aa6842d8d496d5f3dadd360e8 /src/mingw.zig | |
| parent | 0a42602418dcaf08f13b4220b6c216356f87cbfc (diff) | |
| parent | 7377dce368090e3c49a15d8996cc812adadd3d43 (diff) | |
| download | zig-f559ea95b1c37fd6ede8fff6ffb2d74d5c2abc4e.tar.gz zig-f559ea95b1c37fd6ede8fff6ffb2d74d5c2abc4e.zip | |
Merge pull request #12686 from Vexu/stage2-fixes
Stage2 fixes
Diffstat (limited to 'src/mingw.zig')
| -rw-r--r-- | src/mingw.zig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mingw.zig b/src/mingw.zig index b50cc4b009..23035fe72b 100644 --- a/src/mingw.zig +++ b/src/mingw.zig @@ -6,7 +6,6 @@ const assert = std.debug.assert; const log = std.log.scoped(.mingw); const builtin = @import("builtin"); -const target_util = @import("target.zig"); const Compilation = @import("Compilation.zig"); const build_options = @import("build_options"); const Cache = @import("Cache.zig"); @@ -404,11 +403,12 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void { }); errdefer comp.gpa.free(lib_final_path); - const llvm = @import("codegen/llvm/bindings.zig"); - const arch_type = target_util.archToLLVM(target.cpu.arch); + const llvm_bindings = @import("codegen/llvm/bindings.zig"); + const llvm = @import("codegen/llvm.zig"); + const arch_tag = llvm.targetArch(target.cpu.arch); const def_final_path_z = try arena.dupeZ(u8, def_final_path); const lib_final_path_z = try arena.dupeZ(u8, lib_final_path); - if (llvm.WriteImportLibrary(def_final_path_z.ptr, arch_type, lib_final_path_z.ptr, true)) { + if (llvm_bindings.WriteImportLibrary(def_final_path_z.ptr, arch_tag, lib_final_path_z.ptr, true)) { // TODO surface a proper error here log.err("unable to turn {s}.def into {s}.lib", .{ lib_name, lib_name }); return error.WritingImportLibFailed; |
