mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-22 22:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate LC_RPATH entries on macOS Tahoe

Browse Source 
When building on macOS Tahoe, binaries were getting duplicate LC_RPATH
load commands which caused dyld to refuse to run them with a
"duplicate LC_RPATH" error that has become a hard error.

The duplicates occurred when library directories were being added
to rpath_list twice:

- from lib_directories
- from native system paths detection which includes the same dirs
This commit is contained in:
Frank Denis 2025-09-04 23:09:09 +02:00 committed by Alex Rønne Petersen
parent 97df4ae3ce
commit bc921fec12
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.zig
View File

@ -3389,6 +3389,14 @@ fn buildOutputType(
var file_system_inputs: std.ArrayListUnmanaged(u8) = .empty; var file_system_inputs: std.ArrayListUnmanaged(u8) = .empty;
defer file_system_inputs.deinit(gpa); defer file_system_inputs.deinit(gpa);
// Deduplicate rpath entries
var rpath_dedup = std.StringArrayHashMapUnmanaged(void){};
for (create_module.rpath_list.items) |rpath| {
try rpath_dedup.put(arena, rpath, {});
}
create_module.rpath_list.clearRetainingCapacity();
try create_module.rpath_list.appendSlice(arena, rpath_dedup.keys());
var create_diag: Compilation.CreateDiagnostic = undefined; var create_diag: Compilation.CreateDiagnostic = undefined;
const comp = Compilation.create(gpa, arena, &create_diag, .{ const comp = Compilation.create(gpa, arena, &create_diag, .{
.dirs = dirs, .dirs = dirs,