From 943c31a5b4d5229a6727089f38497ad43cbfffbf Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Thu, 27 May 2021 10:48:22 +0200 Subject: [PATCH] Fix missing checks for GHS-Arm Some places where ghs-specific checks were done, were not modified to do the same for ghs-arm. Change-Id: I484f98209188e4c160a13248ca3c3f046b342b22 Reviewed-by: Reviewed-by: Alessandro Portale --- src/plugins/mcusupport/mcusupportoptions.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index 78d359d03bc..9b406a9ec58 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -705,7 +705,8 @@ static void setKitToolchains(Kit *k, const McuToolChainPackage *tcPackage) { // No Green Hills toolchain, because support for it is missing. if (tcPackage->type() == McuToolChainPackage::TypeUnsupported - || tcPackage->type() == McuToolChainPackage::TypeGHS) + || tcPackage->type() == McuToolChainPackage::TypeGHS + || tcPackage->type() == McuToolChainPackage::TypeGHSArm) return; ToolChainKitAspect::setToolChain(k, tcPackage->toolChain( @@ -722,6 +723,7 @@ static void setKitDebugger(Kit *k, const McuToolChainPackage *tcPackage) // No Green Hills and IAR debugger, because support for it is missing. || tcPackage->type() == McuToolChainPackage::TypeUnsupported || tcPackage->type() == McuToolChainPackage::TypeGHS + || tcPackage->type() == McuToolChainPackage::TypeGHSArm || tcPackage->type() == McuToolChainPackage::TypeIAR) return; @@ -823,7 +825,8 @@ static void setKitCMakeOptions(Kit *k, const McuTarget* mcuTarget, const QString CMakeConfig config = CMakeConfigurationKitAspect::configuration(k); // CMake ToolChain file for ghs handles CMAKE_*_COMPILER autonomously - if (mcuTarget->toolChainPackage()->type() != McuToolChainPackage::TypeGHS) { + if (mcuTarget->toolChainPackage()->type() != McuToolChainPackage::TypeGHS && + mcuTarget->toolChainPackage()->type() != McuToolChainPackage::TypeGHSArm) { config.append(CMakeConfigItem("CMAKE_CXX_COMPILER", "%{Compiler:Executable:Cxx}")); config.append(CMakeConfigItem("CMAKE_C_COMPILER", "%{Compiler:Executable:C}")); }