From 77a77b954edff10ed1ebc2e1d3564767d470bb18 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 21 Apr 2016 11:25:39 +0200 Subject: [PATCH] Clang: Do not use run configuration for determining toolchain type Change-Id: I9d09dd800043b88925fad4873759f6c4f8638981 Reviewed-by: Ulf Hermann Reviewed-by: Tobias Hunger --- src/plugins/cpptools/projectpartbuilder.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/plugins/cpptools/projectpartbuilder.cpp b/src/plugins/cpptools/projectpartbuilder.cpp index 51b93a0c38d..d14de454e99 100644 --- a/src/plugins/cpptools/projectpartbuilder.cpp +++ b/src/plugins/cpptools/projectpartbuilder.cpp @@ -281,18 +281,6 @@ QString targetTriple(ProjectExplorer::Project *project, const Core::Id &toolchai return QString(); } -bool projectHasMsvc2015Toolchain(ProjectExplorer::Project *project) -{ - if (project) { - if (ProjectExplorer::Target *target = project->activeTarget()) { - if (ProjectExplorer::RunConfiguration *runConfig = target->activeRunConfiguration()) - return runConfig->abi().osFlavor() == ProjectExplorer::Abi::WindowsMsvc2015Flavor; - } - } - - return false; -} - } /*! @@ -355,7 +343,8 @@ void ProjectPartBuilder::evaluateProjectPartToolchain( projectPart->toolchainDefines = toolChain->predefinedMacros(commandLineFlags); projectPart->toolchainType = toolChain->typeId(); - projectPart->isMsvc2015Toolchain = projectHasMsvc2015Toolchain(projectPart->project); + projectPart->isMsvc2015Toolchain + = toolChain->targetAbi().osFlavor() == ProjectExplorer::Abi::WindowsMsvc2015Flavor; projectPart->targetTriple = targetTriple(projectPart->project, toolChain->typeId()); projectPart->updateLanguageFeatures(); }