Skip to content

Commit d95d073

Browse files
committed
build: the 'bundled' flag is useless
1 parent c355f61 commit d95d073

File tree

1 file changed

+25
-27
lines changed

1 file changed

+25
-27
lines changed

build.zig

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,22 @@ fn getTarget(original_target: ResolvedTarget) ResolvedTarget {
2525
const TestTarget = struct {
2626
query: Query,
2727
single_threaded: bool = false,
28-
bundled: bool,
2928
};
3029

3130
const ci_targets = switch (builtin.target.cpu.arch) {
3231
.x86_64 => switch (builtin.target.os.tag) {
3332
.linux => [_]TestTarget{
34-
TestTarget{ .query = .{ .cpu_arch = .x86_64, .abi = .musl }, .bundled = true },
35-
TestTarget{ .query = .{ .cpu_arch = .x86, .abi = .musl }, .bundled = true },
36-
TestTarget{ .query = .{ .cpu_arch = .aarch64, .abi = .musl }, .bundled = true },
33+
TestTarget{ .query = .{ .cpu_arch = .x86_64, .abi = .musl } },
34+
TestTarget{ .query = .{ .cpu_arch = .x86, .abi = .musl } },
35+
TestTarget{ .query = .{ .cpu_arch = .aarch64, .abi = .musl } },
3736
},
3837
.windows => [_]TestTarget{
39-
TestTarget{ .query = .{ .cpu_arch = .x86_64, .abi = .gnu }, .bundled = true },
38+
TestTarget{ .query = .{ .cpu_arch = .x86_64, .abi = .gnu } },
4039
// Disabled due to https://github.com/ziglang/zig/issues/20047
41-
// TestTarget{ .query = .{ .cpu_arch = .x86, .abi = .gnu }, .bundled = true },
40+
// TestTarget{ .query = .{ .cpu_arch = .x86, .abi = .gnu } },
4241
},
4342
.macos => [_]TestTarget{
44-
TestTarget{ .query = .{ .cpu_arch = .x86_64 }, .bundled = true },
43+
TestTarget{ .query = .{ .cpu_arch = .x86_64 } },
4544
},
4645
else => [_]TestTarget{},
4746
},
@@ -51,44 +50,44 @@ const ci_targets = switch (builtin.target.cpu.arch) {
5150
const all_test_targets = switch (builtin.target.cpu.arch) {
5251
.x86_64 => switch (builtin.target.os.tag) {
5352
.linux => [_]TestTarget{
54-
TestTarget{ .query = .{}, .bundled = false },
55-
TestTarget{ .query = .{ .cpu_arch = .x86_64, .abi = .musl }, .bundled = true },
56-
TestTarget{ .query = .{ .cpu_arch = .x86, .abi = .musl }, .bundled = true },
57-
TestTarget{ .query = .{ .cpu_arch = .aarch64, .abi = .musl }, .bundled = true },
58-
TestTarget{ .query = .{ .cpu_arch = .riscv64, .abi = .musl }, .bundled = true },
59-
TestTarget{ .query = .{ .cpu_arch = .mips, .abi = .musl }, .bundled = true },
60-
TestTarget{ .query = .{ .cpu_arch = .x86_64, .os_tag = .windows }, .bundled = true },
53+
TestTarget{ .query = .{} },
54+
TestTarget{ .query = .{ .cpu_arch = .x86_64, .abi = .musl } },
55+
TestTarget{ .query = .{ .cpu_arch = .x86, .abi = .musl } },
56+
TestTarget{ .query = .{ .cpu_arch = .aarch64, .abi = .musl } },
57+
TestTarget{ .query = .{ .cpu_arch = .riscv64, .abi = .musl } },
58+
TestTarget{ .query = .{ .cpu_arch = .mips, .abi = .musl } },
59+
TestTarget{ .query = .{ .cpu_arch = .x86_64, .os_tag = .windows } },
6160
// Disabled due to https://github.com/ziglang/zig/issues/20047
62-
// TestTarget{ .query = .{ .cpu_arch = .x86, .os_tag = .windows }, .bundled = true },
63-
TestTarget{ .query = .{ .cpu_arch = .x86_64, .os_tag = .macos }, .bundled = true },
64-
TestTarget{ .query = .{ .cpu_arch = .aarch64, .os_tag = .macos }, .bundled = true },
61+
// TestTarget{ .query = .{ .cpu_arch = .x86, .os_tag = .windows } },
62+
TestTarget{ .query = .{ .cpu_arch = .x86_64, .os_tag = .macos } },
63+
TestTarget{ .query = .{ .cpu_arch = .aarch64, .os_tag = .macos } },
6564
},
6665
.windows => [_]TestTarget{
67-
TestTarget{ .query = .{ .cpu_arch = .x86_64, .abi = .gnu }, .bundled = true },
66+
TestTarget{ .query = .{ .cpu_arch = .x86_64, .abi = .gnu } },
6867
// Disabled due to https://github.com/ziglang/zig/issues/20047
69-
// TestTarget{ .query = .{ .cpu_arch = .x86, .abi = .gnu }, .bundled = true },
68+
// TestTarget{ .query = .{ .cpu_arch = .x86, .abi = .gnu } },
7069
},
7170
.freebsd => [_]TestTarget{
72-
TestTarget{ .query = .{}, .bundled = false },
73-
TestTarget{ .query = .{ .cpu_arch = .x86_64 }, .bundled = true },
71+
TestTarget{ .query = .{} },
72+
TestTarget{ .query = .{ .cpu_arch = .x86_64 } },
7473
},
7574
.macos => [_]TestTarget{
76-
TestTarget{ .query = .{ .cpu_arch = .x86_64 }, .bundled = true },
75+
TestTarget{ .query = .{ .cpu_arch = .x86_64 } },
7776
},
7877
else => [_]TestTarget{
79-
TestTarget{ .query = .{}, .bundled = false },
78+
TestTarget{ .query = .{} },
8079
},
8180
},
8281
.aarch64 => switch (builtin.target.os.tag) {
8382
.linux, .windows, .freebsd, .macos => [_]TestTarget{
84-
TestTarget{ .query = .{}, .bundled = true },
83+
TestTarget{ .query = .{} },
8584
},
8685
else => [_]TestTarget{
87-
TestTarget{ .query = .{}, .bundled = false },
86+
TestTarget{ .query = .{} },
8887
},
8988
},
9089
else => [_]TestTarget{
91-
TestTarget{ .query = .{}, .bundled = false },
90+
TestTarget{ .query = .{} },
9291
},
9392
};
9493

@@ -178,7 +177,6 @@ pub fn build(b: *std.Build) !void {
178177

179178
const test_targets = computeTestTargets(query.isNative(), ci) orelse &[_]TestTarget{.{
180179
.query = query,
181-
.bundled = true,
182180
}};
183181
const test_step = b.step("test", "Run library tests");
184182

0 commit comments

Comments
 (0)