From 70670cad234e2a4cee0772037160a5ad0ca043c3 Mon Sep 17 00:00:00 2001 From: Christiaan Janssen Date: Tue, 26 Jan 2021 12:08:52 +0100 Subject: [PATCH] McuSupport: Do not add clang to PATH when creating a new kit (1.7+) Fixes: UL-3591 Change-Id: I7ec618aeb28bb8e79733267056d5c4c0ff7ba382 Reviewed-by: Alessandro Portale --- src/plugins/mcusupport/mcusupportoptions.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index 1d4a82e36c4..55ebe006a9a 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -654,10 +654,13 @@ static void setKitEnvironment(Kit *k, const McuTarget *mcuTarget, processPackage(package); processPackage(qtForMCUsSdkPackage); - const QString path = QLatin1String(HostOsInfo().isWindowsHost() ? "Path" : "PATH"); - pathAdditions.append("${" + path + "}"); - pathAdditions.append(QDir::toNativeSeparators(Core::ICore::libexecPath() + "/clang/bin")); - changes.append({path, pathAdditions.join(HostOsInfo::pathListSeparator())}); + // Clang not needed in version 1.7+ + if (mcuTarget->qulVersion() < QVersionNumber{1,7}) { + const QString path = QLatin1String(HostOsInfo().isWindowsHost() ? "Path" : "PATH"); + pathAdditions.append("${" + path + "}"); + pathAdditions.append(QDir::toNativeSeparators(Core::ICore::libexecPath() + "/clang/bin")); + changes.append({path, pathAdditions.join(HostOsInfo::pathListSeparator())}); + } if (kitNeedsQtVersion()) changes.append({QLatin1String("LD_LIBRARY_PATH"), "%{Qt:QT_INSTALL_LIBS}"});