authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-06-04 00:54:47 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-06-04 00:54:47 -07:00
logd49f4b87884f926d287ae5b508d5e327aec0b1d1
tree0acbd610d266075fb649d1a4a01a15e022888d93
parentb374ff80002f97a0a04708bfbd7932f6d5e10aca

common- apply dep isForThis check on all

1 files changed, 7 insertions(+), 1 deletions(-)

src/common.zig+7-1
...@@ -17,6 +17,9 @@ pub fn collect_deps_deep(dir: []const u8, mpath: []const u8, options: CollectOpt...@@ -17,6 +17,9 @@ pub fn collect_deps_deep(dir: []const u8, mpath: []const u8, options: CollectOpt
17 defer moduledeps.deinit();17 defer moduledeps.deinit();
18 try moduledeps.append(try collect_deps(dir, mpath, options));18 try moduledeps.append(try collect_deps(dir, mpath, options));
19 for (m.devdeps) |d| {19 for (m.devdeps) |d| {
20 if (!d.is_for_this()) {
21 continue;
22 }
20 try get_module_from_dep(moduledeps, d, dir, m.name, options);23 try get_module_from_dep(moduledeps, d, dir, m.name, options);
21 }24 }
22 return u.Module{25 return u.Module{
...@@ -40,6 +43,9 @@ pub fn collect_deps(dir: []const u8, mpath: []const u8, options: CollectOptions)...@@ -40,6 +43,9 @@ pub fn collect_deps(dir: []const u8, mpath: []const u8, options: CollectOptions)
40 const moduledeps = &std.ArrayList(u.Module).init(gpa);43 const moduledeps = &std.ArrayList(u.Module).init(gpa);
41 defer moduledeps.deinit();44 defer moduledeps.deinit();
42 for (m.deps) |d| {45 for (m.deps) |d| {
46 if (!d.is_for_this()) {
47 continue;
48 }
43 try get_module_from_dep(moduledeps, d, dir, m.name, options);49 try get_module_from_dep(moduledeps, d, dir, m.name, options);
44 }50 }
45 return u.Module{51 return u.Module{
...@@ -164,7 +170,7 @@ fn get_module_from_dep(list: *std.ArrayList(u.Module), d: u.Dep, dir: []const u8...@@ -164,7 +170,7 @@ fn get_module_from_dep(list: *std.ArrayList(u.Module), d: u.Dep, dir: []const u8
164 const moddir = try get_moddir(dir, d, parent_name, options);170 const moddir = try get_moddir(dir, d, parent_name, options);
165 switch (d.type) {171 switch (d.type) {
166 .system_lib => {172 .system_lib => {
167 if (d.is_for_this()) try list.append(u.Module{173 try list.append(u.Module{
168 .is_sys_lib = true,174 .is_sys_lib = true,
169 .id = "",175 .id = "",
170 .name = d.path,176 .name = d.path,