diff options
| author | Erik Verbruggen <erik@verbruggen.consulting> | 2021-05-27 10:48:22 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@me.com> | 2021-06-04 13:03:02 +0000 |
| commit | 3282aa92f891b4eab1075eccdfe0df6eb4f7f1c1 (patch) | |
| tree | 84aad1222df9477685447418c4ee111ce97e1494 | |
| parent | b41bf33dff21f1e534645e346444cb995c766a6a (diff) | |
| download | qt-creator-3282aa92f891b4eab1075eccdfe0df6eb4f7f1c1.tar.gz | |
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: <christiaan.janssen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
(cherry picked from commit 943c31a5b4d5229a6727089f38497ad43cbfffbf)
| -rw-r--r-- | src/plugins/mcusupport/mcusupportoptions.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index 2742a108f1..67d0bac89d 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -643,7 +643,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( @@ -660,6 +661,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; @@ -719,7 +721,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}")); } |