| ... | @@ -100,15 +100,14 @@ pub fn main() !void { | ... | @@ -100,15 +100,14 @@ pub fn main() !void { |
| 100 | for (case.targets) |target| { | 100 | for (case.targets) |target| { |
| 101 | const target_prog_node = node: { | 101 | const target_prog_node = node: { |
| 102 | var name_buf: [std.Progress.Node.max_name_len]u8 = undefined; | 102 | var name_buf: [std.Progress.Node.max_name_len]u8 = undefined; |
| 103 | const name = std.fmt.bufPrint(&name_buf, "{s}-{s}", .{ target.query, @tagName(target.backend) }) catch &name_buf; | 103 | const name = std.fmt.bufPrint(&name_buf, "{s}-{t}", .{ target.query, target.backend }) catch &name_buf; |
| 104 | break :node prog_node.start(name, case.updates.len); | 104 | break :node prog_node.start(name, case.updates.len); |
| 105 | }; | 105 | }; |
| 106 | defer target_prog_node.end(); | 106 | defer target_prog_node.end(); |
| 107 | | 107 | |
| 108 | if (debug_log_verbose) { | 108 | if (debug_log_verbose) { |
| 109 | std.log.scoped(.status).info("target: '{s}-{s}'", .{ target.query, @tagName(target.backend) }); | 109 | std.log.scoped(.status).info("target: '{s}-{t}'", .{ target.query, target.backend }); |
| 110 | } | 110 | } |
| 111 | | | |
| 112 | var child_args: std.ArrayListUnmanaged([]const u8) = .empty; | 111 | var child_args: std.ArrayListUnmanaged([]const u8) = .empty; |
| 113 | try child_args.appendSlice(arena, &.{ | 112 | try child_args.appendSlice(arena, &.{ |
| 114 | resolved_zig_exe, | 113 | resolved_zig_exe, |
| ... | @@ -121,8 +120,10 @@ pub fn main() !void { | ... | @@ -121,8 +120,10 @@ pub fn main() !void { |
| 121 | ".local-cache", | 120 | ".local-cache", |
| 122 | "--global-cache-dir", | 121 | "--global-cache-dir", |
| 123 | ".global-cache", | 122 | ".global-cache", |
| 124 | "--listen=-", | | |
| 125 | }); | 123 | }); |
| | 124 | if (target.resolved.os.tag == .windows) try child_args.append(arena, "-lws2_32"); |
| | 125 | try child_args.append(arena, "--listen=-"); |
| | 126 | |
| 126 | if (opt_resolved_lib_dir) |resolved_lib_dir| { | 127 | if (opt_resolved_lib_dir) |resolved_lib_dir| { |
| 127 | try child_args.appendSlice(arena, &.{ "--zig-lib-dir", resolved_lib_dir }); | 128 | try child_args.appendSlice(arena, &.{ "--zig-lib-dir", resolved_lib_dir }); |
| 128 | } | 129 | } |
| ... | @@ -174,8 +175,12 @@ pub fn main() !void { | ... | @@ -174,8 +175,12 @@ pub fn main() !void { |
| 174 | target.query, | 175 | target.query, |
| 175 | "-I", | 176 | "-I", |
| 176 | opt_resolved_lib_dir.?, // verified earlier | 177 | opt_resolved_lib_dir.?, // verified earlier |
| 177 | "-o", | | |
| 178 | }); | 178 | }); |
| | 179 | |
| | 180 | if (target.resolved.os.tag == .windows) |
| | 181 | try cc_child_args.append(arena, "-lws2_32"); |
| | 182 | |
| | 183 | try cc_child_args.append(arena, "-o"); |
| 179 | } | 184 | } |
| 180 | | 185 | |
| 181 | var eval: Eval = .{ | 186 | var eval: Eval = .{ |