From 1478a3653086e44a0a625c0a4b8ab09a7d6eafa9 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 18 Oct 2022 14:18:45 +0300
Subject: [PATCH] ProjectExplorer: Fix prepending executable path for custom
 toolchain

Amends c60c642fe5f7c9836a51845504089da2825311d6.

Change-Id: I214c3d83ef5f1642d581e84f9219e929d765c471
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .../projectexplorer/customtoolchain.cpp        | 18 +++++++++---------
 src/plugins/projectexplorer/customtoolchain.h  |  1 -
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp
index 2d311b43604..4c2904d3cd6 100644
--- a/src/plugins/projectexplorer/customtoolchain.cpp
+++ b/src/plugins/projectexplorer/customtoolchain.cpp
@@ -131,13 +131,14 @@ ToolChain::BuiltInHeaderPathsRunner CustomToolChain::createBuiltInHeaderPathsRun
 
 void CustomToolChain::addToEnvironment(Environment &env) const
 {
-    if (!m_compilerCommand.isEmpty()) {
-        const FilePath path = m_compilerCommand.parentDir();
-        env.prependOrSetPath(path);
-        const FilePath makePath = m_makeCommand.parentDir();
-        if (makePath != path)
-            env.prependOrSetPath(makePath);
-    }
+    const FilePath compiler = compilerCommand();
+    if (compiler.isEmpty())
+        return;
+    const FilePath path = compiler.parentDir();
+    env.prependOrSetPath(path);
+    const FilePath makePath = m_makeCommand.parentDir();
+    if (makePath != path)
+        env.prependOrSetPath(makePath);
 }
 
 QStringList CustomToolChain::suggestedMkspecList() const
@@ -252,8 +253,7 @@ bool CustomToolChain::operator ==(const ToolChain &other) const
         return false;
 
     auto customTc = static_cast<const CustomToolChain *>(&other);
-    return m_compilerCommand == customTc->m_compilerCommand
-            && m_makeCommand == customTc->m_makeCommand
+    return m_makeCommand == customTc->m_makeCommand
             && targetAbi() == customTc->targetAbi()
             && m_predefinedMacros == customTc->m_predefinedMacros
             && m_builtInHeaderPaths == customTc->m_builtInHeaderPaths;
diff --git a/src/plugins/projectexplorer/customtoolchain.h b/src/plugins/projectexplorer/customtoolchain.h
index d05e4c9998b..38a529d1b36 100644
--- a/src/plugins/projectexplorer/customtoolchain.h
+++ b/src/plugins/projectexplorer/customtoolchain.h
@@ -83,7 +83,6 @@ private:
 
     CustomParserSettings customParserSettings() const;
 
-    Utils::FilePath m_compilerCommand;
     Utils::FilePath m_makeCommand;
 
     Macros m_predefinedMacros;