From f4f5e9edd69d3ca8f4d523ca6949487721a4e166 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Thu, 19 Oct 2023 22:41:59 +0200 Subject: dwarf: bring back realpath resolution of include dirs --- src/link/Dwarf.zig | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/link') diff --git a/src/link/Dwarf.zig b/src/link/Dwarf.zig index 76662f5bd7..b78243de74 100644 --- a/src/link/Dwarf.zig +++ b/src/link/Dwarf.zig @@ -2587,12 +2587,17 @@ fn genIncludeDirsAndFileNames(self: *Dwarf, arena: Allocator) !struct { for (self.di_files.keys()) |dif| { const full_path = try dif.mod.root.joinString(arena, dif.sub_file_path); - // TODO re-investigate if realpath is needed here const dir_path = std.fs.path.dirname(full_path) orelse "."; const sub_file_path = std.fs.path.basename(full_path); + // TODO re-investigate if realpath is needed here + var buffer: [std.fs.MAX_PATH_BYTES]u8 = undefined; + const resolved = if (!std.fs.path.isAbsolute(dir_path)) + std.os.realpath(dir_path, &buffer) catch dir_path + else + dir_path; const dir_index: u28 = blk: { - const dirs_gop = dirs.getOrPutAssumeCapacity(dir_path); + const dirs_gop = dirs.getOrPutAssumeCapacity(try arena.dupe(u8, resolved)); break :blk @as(u28, @intCast(dirs_gop.index + 1)); }; -- cgit v1.2.3