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

Accept --gcctoolchain= argument to GCC-based compilers

Browse Source 
Change-Id: I12c9d2e489b210433e9270de22783bbdc5c9544e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-11-24 14:26:51 +01:00
parent 391284f393
commit 4a02611cd5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -365,7 +365,9 @@ QByteArray GccToolChain::predefinedMacros(const QStringList &cxxflags) const
QStringList arguments = gccPredefinedMacrosOptions(); QStringList arguments = gccPredefinedMacrosOptions();
for (int iArg = 0; iArg < allCxxflags.length(); ++iArg) { for (int iArg = 0; iArg < allCxxflags.length(); ++iArg) {
const QString &a = allCxxflags.at(iArg); const QString &a = allCxxflags.at(iArg);
if (a == QLatin1String("-arch")) { if (a.startsWith("--gcc-toolchain=")) {
arguments << a;
} else if (a == QLatin1String("-arch")) {
if (++iArg < allCxxflags.length() && !arguments.contains(a)) if (++iArg < allCxxflags.length() && !arguments.contains(a))
arguments << a << allCxxflags.at(iArg); arguments << a << allCxxflags.at(iArg);
} else if (a == QLatin1String("--sysroot") || a == QLatin1String("-isysroot") } else if (a == QLatin1String("--sysroot") || a == QLatin1String("-isysroot")
@@ -539,7 +541,7 @@ QList<HeaderPath> GccToolChain::systemHeaderPaths(const QStringList &cxxflags, c
QStringList flags; QStringList flags;
flags << m_platformCodeGenFlags << cxxflags; flags << m_platformCodeGenFlags << cxxflags;
foreach (const QString &a, flags) { foreach (const QString &a, flags) {
if (a.startsWith(QLatin1String("-stdlib="))) if (a.startsWith(QLatin1String("-stdlib=")) || a.startsWith("--gcctoolchain="))
arguments << a; arguments << a;
} }