authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-06-09 22:39:28+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-06-11 00:23:10+02:00
log62023c60b4809aee5b23a62c70927075fcce3375
tree894c5977d673d0dc44cbcc08f083d8a20ede3260
parentfcfeafe99a3ecc694a3475735c81a0d75b6da6d0

stage2: correctly work out dirname for ar

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

src/link.zig+2-3
...@@ -797,9 +797,8 @@ pub const File = struct {...@@ -797,9 +797,8 @@ pub const File = struct {
797 } else {797 } else {
798 try base.flushModule(comp, prog_node);798 try base.flushModule(comp, prog_node);
799 }799 }
800 break :blk try fs.path.join(arena, &.{800 const dirname = fs.path.dirname(full_out_path_z) orelse ".";
801 fs.path.dirname(full_out_path_z).?, base.intermediary_basename.?,801 break :blk try fs.path.join(arena, &.{ dirname, base.intermediary_basename.? });
802 });
803 } else null;802 } else null;
804803
805 log.debug("module_obj_path={s}", .{if (module_obj_path) |s| s else "(null)"});804 log.debug("module_obj_path={s}", .{if (module_obj_path) |s| s else "(null)"});