diff options
| author | Veikka Tuominen <git@vexu.eu> | 2024-09-08 14:23:03 +0300 |
|---|---|---|
| committer | Veikka Tuominen <git@vexu.eu> | 2024-09-09 12:35:49 +0300 |
| commit | de8cece6e7be570a7e622c54c0cbbc7c99308a08 (patch) | |
| tree | abf91cfa0c3d74725a6a6c17496a9999dcd99d81 /src | |
| parent | 9e6d167bb7878682e99482bfaef12e45376665f9 (diff) | |
| download | zig-de8cece6e7be570a7e622c54c0cbbc7c99308a08.tar.gz zig-de8cece6e7be570a7e622c54c0cbbc7c99308a08.zip | |
sync Aro dependency
ref: adfd13c6ffb563b1379052b92f6ae4148b91cc12
Diffstat (limited to 'src')
| -rw-r--r-- | src/mingw.zig | 4 | ||||
| -rw-r--r-- | src/translate_c.zig | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mingw.zig b/src/mingw.zig index 114c168765..ab5f4f26db 100644 --- a/src/mingw.zig +++ b/src/mingw.zig @@ -230,7 +230,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void { }; const aro = @import("aro"); - var aro_comp = aro.Compilation.init(comp.gpa); + var aro_comp = aro.Compilation.init(comp.gpa, std.fs.cwd()); defer aro_comp.deinit(); const include_dir = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libc", "mingw", "def-include" }); @@ -268,7 +268,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void { // new scope to ensure definition file is written before passing the path to WriteImportLibrary const def_final_file = try o_dir.createFile(final_def_basename, .{ .truncate = true }); defer def_final_file.close(); - try pp.prettyPrintTokens(def_final_file.writer()); + try pp.prettyPrintTokens(def_final_file.writer(), .result_only); } const lib_final_path = try comp.global_cache_directory.join(comp.gpa, &[_][]const u8{ diff --git a/src/translate_c.zig b/src/translate_c.zig index ef81a5dfda..9e974fc237 100644 --- a/src/translate_c.zig +++ b/src/translate_c.zig @@ -5258,7 +5258,7 @@ fn getMacroText(unit: *const clang.ASTUnit, c: *const Context, macro: *const cla const end_c = c.source_manager.getCharacterData(end_loc); const slice_len = @intFromPtr(end_c) - @intFromPtr(begin_c); - var comp = aro.Compilation.init(c.gpa); + var comp = aro.Compilation.init(c.gpa, std.fs.cwd()); defer comp.deinit(); const result = comp.addSourceFromBuffer("", begin_c[0..slice_len]) catch return error.OutOfMemory; |
