mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-16 03:03:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.zig.system: Fix wine executable name in getExternalExecutor().

Browse Source 
I'm not actually aware of any distro where the name is wine64, so just use wine
in all cases. As part of this, I also fixed the architecture checks to match
reality.

Closes #23411.
This commit is contained in:
Alex Rønne Petersen 2025-04-02 23:36:01 +02:00
parent 1b62a22268
commit 55ee88f9c0
No known key found for this signature in database
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/std/zig/system.zig
View File

@ -128,19 +128,17 @@ pub fn getExternalExecutor(
switch (candidate.os.tag) {
.windows => {
if (options.allow_wine) {
// x86_64 wine does not support emulating aarch64-windows and
// vice versa.
if (candidate.cpu.arch != builtin.cpu.arch and
!(candidate.cpu.arch == .thumb and builtin.cpu.arch == .aarch64) and
!(candidate.cpu.arch == .x86 and builtin.cpu.arch == .x86_64))
{
return bad_result;
}
switch (candidate.ptrBitWidth()) {
32 => return Executor{ .wine = "wine" },
64 => return Executor{ .wine = "wine64" },
else => return bad_result,
}
const wine_supported = switch (candidate.cpu.arch) {
.thumb => switch (host.cpu.arch) {
.arm, .thumb, .aarch64 => true,
else => false,
},
.aarch64 => host.cpu.arch == .aarch64,
.x86 => host.cpu.arch.isX86(),
.x86_64 => host.cpu.arch == .x86_64,
else => false,
};
return if (wine_supported) Executor{ .wine = "wine" } else bad_result;
}
return bad_result;
},