diff options
| author | Ganesan Rajagopal <rganesan@gmail.com> | 2022-12-05 16:17:19 +0530 |
|---|---|---|
| committer | Jakub Konka <kubkon@jakubkonka.com> | 2023-03-19 17:42:27 +0100 |
| commit | 30aeb41a19d3ac15c89190cd546cbe7c05c60ac8 (patch) | |
| tree | 541225ae59e2494310f2da5739498e6c49517179 /src | |
| parent | 2fce991d2ab1dfc6d591b560607ef0edecc7db19 (diff) | |
| download | zig-30aeb41a19d3ac15c89190cd546cbe7c05c60ac8.tar.gz zig-30aeb41a19d3ac15c89190cd546cbe7c05c60ac8.zip | |
Fix linker segfault adding rpath to sharedlib
If the shared library is a relative path, dirname will return null causing a segfault. In the case I debugged, the current directory was already in RPATH so just ignoring this case seems a reasonable fix. After this fix "make" and "make test" pass for mimalloc.
Closes #13766
Diffstat (limited to 'src')
| -rw-r--r-- | src/link/Elf.zig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/link/Elf.zig b/src/link/Elf.zig index f1ab98372e..fcab34bf5e 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -1636,7 +1636,7 @@ fn linkWithLLD(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node) !v } for (self.base.options.objects) |obj| { if (Compilation.classifyFileExt(obj.path) == .shared_library) { - const lib_dir_path = std.fs.path.dirname(obj.path).?; + const lib_dir_path = std.fs.path.dirname(obj.path) orelse continue; if ((try rpath_table.fetchPut(lib_dir_path, {})) == null) { try argv.append("-rpath"); try argv.append(lib_dir_path); |