From 310002b87289c3f9c8a0c1178dcafcb32132ebe5 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Sat, 21 Aug 2021 04:21:52 -0700 Subject: [PATCH] patch fix for breaking local deps and embedded files --- src/common.zig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common.zig b/src/common.zig index 444da0e3055ff8343d8abf4b72115b648493e8a8..f4c6f7212eef2ebb9239f80690e0219ae7af6176 100644 --- a/src/common.zig +++ b/src/common.zig @@ -209,7 +209,7 @@ pub fn get_module_from_dep(d: *u.Dep, cachepath: []const u8, parent_name: []cons } } const modpath = try get_modpath(cachepath, d.*, parent_name, options); - const moddir = try std.fs.cwd().openDir(modpath, .{}); + const moddir = if (std.mem.eql(u8, modpath, "files") or modpath.len == 0) try std.fs.cwd().openDir(cachepath, .{}) else try std.fs.cwd().openDir(modpath, .{}); const nocache = d.type == .local or d.type == .system_lib; if (!nocache) try options.already_fetched.append(modpath); @@ -269,6 +269,7 @@ pub fn get_module_from_dep(d: *u.Dep, cachepath: []const u8, parent_name: []cons if (d.only_os.len > 0) dd.only_os = d.only_os; if (d.except_os.len > 0) dd.except_os = d.except_os; if (d.type == .local) dd.main = try std.fs.path.join(gpa, &.{ d.main, save.main }); + if (std.mem.eql(u8, modpath, "files")) dd.clean_path = modpath; if (dd.is_for_this()) return dd; return null; }, -- 2.54.0