authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-12-22 15:42:22-08:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-01-15 15:11:36-08:00
log9cd7cad42ec65bf2bfa2875dfedf5e84da950ced
treeaab95ecedc46bfa174de88764f44a8b1ae3865b4
parent0d028e4407e4c14f1343b62ab7fdf881c208ffc9

Compilation: account for C objects and resources in prelink

1 files changed, 4 insertions(+), 0 deletions(-)

src/Compilation.zig+4
...@@ -1725,6 +1725,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil...@@ -1725,6 +1725,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil
1725 };1725 };
1726 comp.c_object_table.putAssumeCapacityNoClobber(c_object, {});1726 comp.c_object_table.putAssumeCapacityNoClobber(c_object, {});
1727 }1727 }
1728 comp.remaining_prelink_tasks += @intCast(comp.c_object_table.count());
17281729
1729 // Add a `Win32Resource` for each `rc_source_files` and one for `manifest_file`.1730 // Add a `Win32Resource` for each `rc_source_files` and one for `manifest_file`.
1730 const win32_resource_count =1731 const win32_resource_count =
...@@ -1742,6 +1743,8 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil...@@ -1742,6 +1743,8 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil
1742 };1743 };
1743 comp.win32_resource_table.putAssumeCapacityNoClobber(win32_resource, {});1744 comp.win32_resource_table.putAssumeCapacityNoClobber(win32_resource, {});
1744 }1745 }
1746 comp.remaining_prelink_tasks += @intCast(comp.win32_resource_table.count());
1747
1745 if (options.manifest_file) |manifest_path| {1748 if (options.manifest_file) |manifest_path| {
1746 const win32_resource = try gpa.create(Win32Resource);1749 const win32_resource = try gpa.create(Win32Resource);
1747 errdefer gpa.destroy(win32_resource);1750 errdefer gpa.destroy(win32_resource);
...@@ -1751,6 +1754,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil...@@ -1751,6 +1754,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil
1751 .src = .{ .manifest = manifest_path },1754 .src = .{ .manifest = manifest_path },
1752 };1755 };
1753 comp.win32_resource_table.putAssumeCapacityNoClobber(win32_resource, {});1756 comp.win32_resource_table.putAssumeCapacityNoClobber(win32_resource, {});
1757 comp.remaining_prelink_tasks += 1;
1754 }1758 }
1755 }1759 }
17561760