feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BareMetal: Fix detection of C++ language option for IAR

Browse Source 
... which is used at dumping of predefined macros
and a header paths.

Reason is that for the different architectures the IAR
use different C++ language options:

* for ARM: --c++
* for AVR or 8051: --ec++

Change-Id: I00ceadaf87348ee2250b9455ca04eed4bcb703a7
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Denis Shienkov
2019-07-23 19:41:05 +03:00
parent c1a83b2a88
commit 37a6e6b58a
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/baremetal/iarewtoolchain.cpp
View File

@@ -66,6 +66,16 @@ static bool compilerExists(const FilePath &compilerPath)
return fi.exists() && fi.isExecutable() && fi.isFile(); return fi.exists() && fi.isExecutable() && fi.isFile();
} }
static QString cppLanguageOption(const FilePath &compiler)
{
const QString baseName = compiler.toFileInfo().baseName();
if (baseName == "iccarm")
return "--c++";
if (baseName == "icc8051" || baseName == "iccavr")
return "--ec++";
return {};
}
static Macros dumpPredefinedMacros(const FilePath &compiler, const Core::Id languageId, static Macros dumpPredefinedMacros(const FilePath &compiler, const Core::Id languageId,
const QStringList &env) const QStringList &env)
{ {
@@ -88,7 +98,7 @@ static Macros dumpPredefinedMacros(const FilePath &compiler, const Core::Id lang
QStringList arguments; QStringList arguments;
arguments.push_back(fakeIn.fileName()); arguments.push_back(fakeIn.fileName());
if (languageId == ProjectExplorer::Constants::CXX_LANGUAGE_ID) if (languageId == ProjectExplorer::Constants::CXX_LANGUAGE_ID)
arguments.push_back("--c++"); arguments.push_back(cppLanguageOption(compiler));
arguments.push_back("--predef_macros"); arguments.push_back("--predef_macros");
arguments.push_back(outpath); arguments.push_back(outpath);
@@ -134,7 +144,7 @@ static HeaderPaths dumpHeaderPaths(const FilePath &compiler, const Core::Id lang
QStringList arguments; QStringList arguments;
arguments.push_back(fakeIn.fileName()); arguments.push_back(fakeIn.fileName());
if (languageId == ProjectExplorer::Constants::CXX_LANGUAGE_ID) if (languageId == ProjectExplorer::Constants::CXX_LANGUAGE_ID)
arguments.push_back("--c++"); arguments.push_back(cppLanguageOption(compiler));
arguments.push_back("--preinclude"); arguments.push_back("--preinclude");
arguments.push_back("."); arguments.push_back(".");