From 10cb0b77a0429a0ac6b427bbc3f07540172c2894 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 17 Oct 2017 12:27:37 +0200 Subject: ProjectExplorer: Do not prepend compiler path to PATH everywhere! Do not unconditionally prepend the (c++) compiler path to PATH for all projects using GCC-derived toolchains. Prepend the compiler path in the Qmake- and GenericBuildConfigurations instead. Also change the order: Apply buildconfiguration's addToEnvironment first, only then apply the kit's addToEnvironment. This does change a few things: * CMake and Qbs will now get the normal PATH * MSVC compilers will have their compiler path prepended to PATH by the effected BuildConfigurations. This should be harmless, since that happens before the environment setup script is appended. Task-number: QTCREATORBUG-18714 Change-Id: I548182bc447d80d24f4de4ce7cf12ee1a753ed26 Reviewed-by: Eike Ziller --- src/plugins/genericprojectmanager/genericbuildconfiguration.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/plugins/genericprojectmanager/genericbuildconfiguration.h') diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.h b/src/plugins/genericprojectmanager/genericbuildconfiguration.h index 75f5ceef5d..54e375e88f 100644 --- a/src/plugins/genericprojectmanager/genericbuildconfiguration.h +++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.h @@ -52,6 +52,8 @@ public: BuildType buildType() const override; + void addToEnvironment(Utils::Environment &env) const final; + protected: GenericBuildConfiguration(ProjectExplorer::Target *parent, GenericBuildConfiguration *source); GenericBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id); -- cgit v1.2.1