Clang: Explicitly set the target triple

As for the analyzer, this makes us independent of the default triple and will
most likely reduce the maintenance - e.g. the target implies certain internal
command line arguments, we will profit from added ones.

This fixes parsing of mingw headers with the clang code model.

Change-Id: I722b981125a80fac5f62a7af40a83ecdd7bbf811
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2016-04-08 14:19:23 +02:00
parent 0235412b34
commit 276f4c489c
6 changed files with 40 additions and 1 deletions

View File

@@ -61,6 +61,14 @@ void CompilerOptionsBuilder::addDefine(const QByteArray &defineLine)
m_options.append(defineLineToDefineOption(defineLine));
}
void CompilerOptionsBuilder::addTargetTriple()
{
if (!m_projectPart.targetTriple.isEmpty()) {
m_options.append(QLatin1String("-target"));
m_options.append(m_projectPart.targetTriple);
}
}
void CompilerOptionsBuilder::addHeaderPathOptions()
{
typedef ProjectPartHeaderPath HeaderPath;

View File

@@ -45,6 +45,7 @@ public:
void addDefine(const QByteArray &defineLine);
// Add options based on project part
virtual void addTargetTriple();
void addHeaderPathOptions();
void addToolchainAndProjectDefines();
virtual void addLanguageOption(ProjectFile::Kind fileKind);

View File

@@ -104,6 +104,7 @@ public: // fields
QByteArray projectDefines;
QByteArray toolchainDefines;
Core::Id toolchainType;
QString targetTriple;
ProjectPartHeaderPaths headerPaths;
QStringList precompiledHeaders;
LanguageVersion languageVersion;

View File

@@ -262,6 +262,23 @@ ProjectPartHeaderPath toProjectPartHeaderPath(const ProjectExplorer::HeaderPath
return ProjectPartHeaderPath(headerPath.path(), headerPathType);
}
QString targetTriple(ProjectExplorer::Project *project, const Core::Id &toolchainId)
{
using namespace ProjectExplorer;
if (toolchainId == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)
return QLatin1String("i686-pc-windows-msvc");
if (project) {
if (Target *target = project->activeTarget()) {
if (ToolChain *toolChain = ToolChainKitInformation::toolChain(target->kit()))
return toolChain->originalTargetTriple();
}
}
return QString();
}
}
/*!
@@ -324,6 +341,7 @@ void ProjectPartBuilder::evaluateProjectPartToolchain(
projectPart->toolchainDefines = toolChain->predefinedMacros(commandLineFlags);
projectPart->toolchainType = toolChain->typeId();
projectPart->targetTriple = targetTriple(projectPart->project, toolChain->typeId());
projectPart->updateLanguageFeatures();
}