feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix missing checks for GHS-Arm

Browse Source 
Some places where ghs-specific checks were done, were not modified to
do the same for ghs-arm.

Change-Id: I484f98209188e4c160a13248ca3c3f046b342b22
Reviewed-by: <christiaan.janssen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
(cherry picked from commit 943c31a5b4)
This commit is contained in:
Erik Verbruggen
2021-05-27 10:48:22 +02:00
committed by Erik Verbruggen
parent b41bf33dff
commit 3282aa92f8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/mcusupport/mcusupportoptions.cpp
View File

@@ -643,7 +643,8 @@ static void setKitToolchains(Kit *k, const McuToolChainPackage *tcPackage)
{ {
// No Green Hills toolchain, because support for it is missing. // No Green Hills toolchain, because support for it is missing.
if (tcPackage->type() == McuToolChainPackage::TypeUnsupported if (tcPackage->type() == McuToolChainPackage::TypeUnsupported
|| tcPackage->type() == McuToolChainPackage::TypeGHS) || tcPackage->type() == McuToolChainPackage::TypeGHS
|| tcPackage->type() == McuToolChainPackage::TypeGHSArm)
return; return;
ToolChainKitAspect::setToolChain(k, tcPackage->toolChain( ToolChainKitAspect::setToolChain(k, tcPackage->toolChain(
@@ -660,6 +661,7 @@ static void setKitDebugger(Kit *k, const McuToolChainPackage *tcPackage)
// No Green Hills and IAR debugger, because support for it is missing. // No Green Hills and IAR debugger, because support for it is missing.
|| tcPackage->type() == McuToolChainPackage::TypeUnsupported || tcPackage->type() == McuToolChainPackage::TypeUnsupported
|| tcPackage->type() == McuToolChainPackage::TypeGHS || tcPackage->type() == McuToolChainPackage::TypeGHS
|| tcPackage->type() == McuToolChainPackage::TypeGHSArm
|| tcPackage->type() == McuToolChainPackage::TypeIAR) || tcPackage->type() == McuToolChainPackage::TypeIAR)
return; return;
@@ -719,7 +721,8 @@ static void setKitCMakeOptions(Kit *k, const McuTarget* mcuTarget, const QString
CMakeConfig config = CMakeConfigurationKitAspect::configuration(k); CMakeConfig config = CMakeConfigurationKitAspect::configuration(k);
// CMake ToolChain file for ghs handles CMAKE_*_COMPILER autonomously // 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_CXX_COMPILER", "%{Compiler:Executable:Cxx}"));
config.append(CMakeConfigItem("CMAKE_C_COMPILER", "%{Compiler:Executable:C}")); config.append(CMakeConfigItem("CMAKE_C_COMPILER", "%{Compiler:Executable:C}"));
} }