diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2024-07-12 23:34:53 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2024-07-13 02:13:03 -0700 |
| commit | d8c1c9ea6e5ba70e9d7e7ce9b6c6b85f08cd4bca (patch) | |
| tree | dd876b1f3b3b5bd21de6a5aa3253345fd24418d4 /src/Compilation.zig | |
| parent | 9f8e4ddf25feba313f7a9982796c4caf54fca6f9 (diff) | |
| download | zig-d8c1c9ea6e5ba70e9d7e7ce9b6c6b85f08cd4bca.tar.gz zig-d8c1c9ea6e5ba70e9d7e7ce9b6c6b85f08cd4bca.zip | |
frontend: report correct paths for C objects
oops, the src_path field of CObject is not relative to the module
owner's root directory.
Diffstat (limited to 'src/Compilation.zig')
| -rw-r--r-- | src/Compilation.zig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 94ce0ee267..d262d6742d 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -942,7 +942,7 @@ const CacheUse = union(CacheMode) { implib_sub_path: ?[]u8, docs_sub_path: ?[]u8, lf_open_opts: link.File.OpenOptions, - tmp_artifact_directory: ?Cache.Directory, + tmp_artifact_directory: ?Directory, /// Prevents other processes from clobbering files in the output directory. lock: ?Cache.Lock, @@ -2128,7 +2128,7 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void { } if (comp.file_system_inputs) |fsi| { for (comp.c_object_table.keys()) |c_object| { - try comp.appendFileSystemInput(fsi, c_object.src.owner.root, c_object.src.src_path); + try comp.appendFileSystemInput(fsi, Cache.Path.cwd(), c_object.src.src_path); } } @@ -2141,7 +2141,7 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void { } if (comp.file_system_inputs) |fsi| { for (comp.win32_resource_table.keys()) |win32_resource| switch (win32_resource.src) { - .rc => |f| try comp.appendFileSystemInput(fsi, f.owner.root, f.src_path), + .rc => |f| try comp.appendFileSystemInput(fsi, Cache.Path.cwd(), f.src_path), .manifest => continue, }; } |
