From 349e525031652b65f4894f9e752546cfac805afd Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 30 Jun 2020 18:07:41 +0200 Subject: [PATCH] McuSupport: Skip Renesas' "RGL" board SDK ghs-renesas-rh850-d1m1a.json lists "boardSdk/envVar": "RGL_DIR". However, that dependency is already handled as vendorSdk. This and the other board SDKs differ so much, that we simply keep "RGL" as vendorSdk and skip it when creating board SDKs. Amends c43ef81d4f59c07b580a8c95335ed9cc6fa7955d Task-number: QTCREATORBUG-24201 Change-Id: I052d50f413ecc5f318d4146c207ab690acf1b1f5 Reviewed-by: Eike Ziller --- src/plugins/mcusupport/mcusupportsdk.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index 7509fefba37..143dad05ad0 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -280,7 +280,8 @@ static QVector targetsFromDescriptions(const QList required3rdPartyPkgs = { vendorPkgs.value(desc.platformVendor), tcPkg }; - if (!desc.boardSdkEnvVar.isEmpty()) { + if (!desc.boardSdkEnvVar.isEmpty() + && desc.boardSdkEnvVar != "RGL_DIR") { // Already included in vendorPkgs if (!boardSdkPkgs.contains(desc.boardSdkEnvVar)) { auto boardSdkPkg = createBoardSdkPackage(desc.boardSdkEnvVar); boardSdkPkgs.insert(desc.boardSdkEnvVar, boardSdkPkg);