| ... | @@ -39,13 +39,17 @@ pub fn write(b: *std.Build, wc: *Configuration.Wip, writer: *std.Io.Writer) !voi | ... | @@ -39,13 +39,17 @@ pub fn write(b: *std.Build, wc: *Configuration.Wip, writer: *std.Io.Writer) !voi |
| 39 | // instance. Otherwise, addModule may access a package instance that hasn't | 39 | // instance. Otherwise, addModule may access a package instance that hasn't |
| 40 | // been created yet with packageInstanceFromBuilder. | 40 | // been created yet with packageInstanceFromBuilder. |
| 41 | | 41 | |
| 42 | s.package_instance_map.putAssumeCapacityNoClobber(b, {}); | 42 | { |
| 43 | var iter = b.graph.dependency_cache.valueIterator(); | 43 | s.package_instance_map.putAssumeCapacityNoClobber(b, {}); |
| 44 | while (iter.next()) |dep| s.package_instance_map.putAssumeCapacityNoClobber(dep.*.builder, {}); | 44 | var it = b.graph.dependency_cache.valueIterator(); |
| | 45 | while (it.next()) |dep| s.package_instance_map.putAssumeCapacityNoClobber(dep.*.builder, {}); |
| | 46 | } |
| 45 | | 47 | |
| 46 | try s.addPackageInstance(b); | 48 | { |
| 47 | var iter2 = b.graph.dependency_cache.valueIterator(); | 49 | try s.addPackageInstance(b); |
| 48 | while (iter2.next()) |dep| try s.addPackageInstance(dep.*.builder); | 50 | var it = b.graph.dependency_cache.valueIterator(); |
| | 51 | while (it.next()) |dep| try s.addPackageInstance(dep.*.builder); |
| | 52 | } |
| 49 | | 53 | |
| 50 | try wc.path_deps.ensureTotalCapacityPrecise(gpa, graph.configure_dependencies.items.len); | 54 | try wc.path_deps.ensureTotalCapacityPrecise(gpa, graph.configure_dependencies.items.len); |
| 51 | for ( | 55 | for ( |