authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-07-12 23:34:53-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-07-13 02:13:03-07:00
logd8c1c9ea6e5ba70e9d7e7ce9b6c6b85f08cd4bca
treedd876b1f3b3b5bd21de6a5aa3253345fd24418d4
parent9f8e4ddf25feba313f7a9982796c4caf54fca6f9

frontend: report correct paths for C objects

oops, the src_path field of CObject is not relative to the module owner's root directory.

1 files changed, 3 insertions(+), 3 deletions(-)

src/Compilation.zig+3-3
...@@ -942,7 +942,7 @@ const CacheUse = union(CacheMode) {...@@ -942,7 +942,7 @@ const CacheUse = union(CacheMode) {
942 implib_sub_path: ?[]u8,942 implib_sub_path: ?[]u8,
943 docs_sub_path: ?[]u8,943 docs_sub_path: ?[]u8,
944 lf_open_opts: link.File.OpenOptions,944 lf_open_opts: link.File.OpenOptions,
945 tmp_artifact_directory: ?Cache.Directory,945 tmp_artifact_directory: ?Directory,
946 /// Prevents other processes from clobbering files in the output directory.946 /// Prevents other processes from clobbering files in the output directory.
947 lock: ?Cache.Lock,947 lock: ?Cache.Lock,
948948
...@@ -2128,7 +2128,7 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {...@@ -2128,7 +2128,7 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {
2128 }2128 }
2129 if (comp.file_system_inputs) |fsi| {2129 if (comp.file_system_inputs) |fsi| {
2130 for (comp.c_object_table.keys()) |c_object| {2130 for (comp.c_object_table.keys()) |c_object| {
2131 try comp.appendFileSystemInput(fsi, c_object.src.owner.root, c_object.src.src_path);2131 try comp.appendFileSystemInput(fsi, Cache.Path.cwd(), c_object.src.src_path);
2132 }2132 }
2133 }2133 }
21342134
...@@ -2141,7 +2141,7 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {...@@ -2141,7 +2141,7 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {
2141 }2141 }
2142 if (comp.file_system_inputs) |fsi| {2142 if (comp.file_system_inputs) |fsi| {
2143 for (comp.win32_resource_table.keys()) |win32_resource| switch (win32_resource.src) {2143 for (comp.win32_resource_table.keys()) |win32_resource| switch (win32_resource.src) {
2144 .rc => |f| try comp.appendFileSystemInput(fsi, f.owner.root, f.src_path),2144 .rc => |f| try comp.appendFileSystemInput(fsi, Cache.Path.cwd(), f.src_path),
2145 .manifest => continue,2145 .manifest => continue,
2146 };2146 };
2147 }2147 }