From 749e67dee87ca66e7c69f74020fc262f712a635a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Mon, 6 Jan 2025 15:35:50 +0100 Subject: [PATCH] std.zig.system: Reject x32 for QEMU in getExternalExecutor(). --- lib/std/zig/system.zig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/std/zig/system.zig b/lib/std/zig/system.zig index 591e369ff7..feb96317c8 100644 --- a/lib/std/zig/system.zig +++ b/lib/std/zig/system.zig @@ -116,7 +116,10 @@ pub fn getExternalExecutor( }, .sparc64 => Executor{ .qemu = "qemu-sparc64" }, .x86 => Executor{ .qemu = "qemu-i386" }, - .x86_64 => Executor{ .qemu = "qemu-x86_64" }, + .x86_64 => switch (candidate.abi) { + .gnux32, .muslx32 => return bad_result, + else => Executor{ .qemu = "qemu-x86_64" }, + }, .xtensa => Executor{ .qemu = "qemu-xtensa" }, else => return bad_result, };