zig

commit 5440ca8eb7b7078cbca4b89f6540f08b5bb94960 (tree)
parent 67463c4357d0d0f43b8962231659fb8a1cc4869a
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Thu, 24 Sep 2020 22:15:40 -0700

--main-pkg-path properly resolves the relative root src file path

Diffstat:
M
src/main.zig
 | 
18
+++++++++---------

1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main.zig b/src/main.zig
@@ -1276,15 +1276,15 @@ pub fn buildOutputType(
     defer if (cleanup_root_dir) |*dir| dir.close();
 
     const root_pkg: ?*Package = if (root_src_file) |src_path| blk: {
-        root_pkg_memory.root_src_directory = m: {
-            if (main_pkg_path) |p| {
-                const dir = try fs.cwd().openDir(p, .{});
-                cleanup_root_dir = dir;
-                break :m .{ .path = p, .handle = dir };
-            }
-            break :m .{ .path = null, .handle = fs.cwd() };
-        };
-        root_pkg_memory.root_src_path = src_path;
+        if (main_pkg_path) |p| {
+            const dir = try fs.cwd().openDir(p, .{});
+            cleanup_root_dir = dir;
+            root_pkg_memory.root_src_directory = .{ .path = p, .handle = dir };
+            root_pkg_memory.root_src_path = try fs.path.relative(arena, p, src_path);
+        } else {
+            root_pkg_memory.root_src_directory = .{ .path = null, .handle = fs.cwd() };
+            root_pkg_memory.root_src_path = src_path;
+        }
         break :blk &root_pkg_memory;
     } else null;