From 0e80f63a1ae675692afdfc9085bbaf2d228b6a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sivert=20Kr=C3=B8vel?= <sivert.krovel@qt.io>
Date: Fri, 31 May 2024 13:41:43 +0200
Subject: [PATCH] McuSupport: Use arm-none-eabi-gdb as a backup debugger

We normally use arm-none-eabi-gdb-py, but this doesn't come
with the new arm gcc version which ships with Qt for MCUs 2.8.0
To make sure the kit works, use this as a fallback.

Task-number: QTCREATORBUG-30699
Change-Id: I85c6c3ea1f7aae504e0aa1afb8a344d9bc3067d5
Reviewed-by: Kwangsub Kim <kwangsub.kim@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/mcusupport/mcupackage.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/plugins/mcusupport/mcupackage.cpp b/src/plugins/mcusupport/mcupackage.cpp
index efcff77352b..2ccc4bcc1a0 100644
--- a/src/plugins/mcusupport/mcupackage.cpp
+++ b/src/plugins/mcusupport/mcupackage.cpp
@@ -569,6 +569,10 @@ QVariant McuToolchainPackage::debuggerId() const
     switch (m_type) {
     case ToolchainType::ArmGcc: {
         sub = QString::fromLatin1("bin/arm-none-eabi-gdb-py");
+        const FilePath command = (path() / sub).withExecutableSuffix();
+        if (!command.exists()) {
+            sub = QString::fromLatin1("bin/arm-none-eabi-gdb");
+        }
         displayName = Tr::tr("Arm GDB at %1");
         engineType = Debugger::GdbEngineType;
         break;