From ea47190ed6164580dfecd094b114f136dfb337b2 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Mon, 30 May 2022 10:49:07 +0200 Subject: [PATCH] Debugger: Use arm64 cdb only on Arm64 host Otherwise on x86/x64 there will be a machine type mismatch warning displayed. Amends 21ed15fcc930738116f26ab4c230702e319df7af Change-Id: I7faee1a6f9eaa7abdabcd92a26de763b27a0e085 Reviewed-by: David Schulz Reviewed-by: --- src/plugins/debugger/debuggeritemmanager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index 9efc8df4a25..4f0d4702589 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -669,7 +669,9 @@ void DebuggerItemManagerPrivate::autoDetectCdbDebuggers() for (const QFileInfo &kitFolderFi : kitFolders) { const QString path = kitFolderFi.absoluteFilePath(); - const QStringList abis = {"x86", "x64", "arm64"}; + QStringList abis = {"x86", "x64"}; + if (HostOsInfo::hostArchitecture() == HostOsInfo::HostArchitectureArm) + abis << "arm64"; for (const QString &abi: abis) { const QFileInfo cdbBinary(path + "/Debuggers/" + abi + "/cdb.exe"); if (cdbBinary.isExecutable())