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

ProjectExplorer: Split sysroot and target flags

Browse Source 
Whitelist target even if we have the sysroot set in the kit.

Change-Id: Ie51c0b25255e23458321303fc80ee9cf91879ab1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Ivan Donchevskii
2019-01-07 15:54:17 +01:00
parent 820e4f8177
commit 81ce096719
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -546,15 +546,19 @@ QStringList GccToolChain::gccPrepareArguments(const QStringList &flags,
for (int i = 0; i < allFlags.size(); ++i) { for (int i = 0; i < allFlags.size(); ++i) {
const QString &flag = allFlags.at(i); const QString &flag = allFlags.at(i);
if (flag.startsWith("-stdlib=") || flag.startsWith("--gcc-toolchain=") if (flag.startsWith("-stdlib=") || flag.startsWith("--gcc-toolchain=")
|| flag.startsWith("-B") || (flag.startsWith("-isystem") && flag.length() > 8)) { || flag.startsWith("-B") || flag.startsWith("--target=")
|| (flag.startsWith("-isystem") && flag.length() > 8)) {
arguments << flag; arguments << flag;
} else if ((flag == "-target" || flag == "-gcc-toolchain" || flag == "-isystem")
&& i < flags.size() - 1) {
arguments << flag << allFlags.at(i + 1);
++i;
} else if (!hasKitSysroot) { } else if (!hasKitSysroot) {
// pass build system's sysroot to compiler, if we didn't pass one from kit // pass build system's sysroot to compiler, if we didn't pass one from kit
if (flag.startsWith("--sysroot=")) { if (flag.startsWith("--sysroot=")
|| (flag.startsWith("-isysroot") && flag.length() > 9)) {
arguments << flag; arguments << flag;
} else if ((flag.startsWith("-isysroot") || flag.startsWith("--sysroot") } else if (flag == "-isysroot" && i < flags.size() - 1) {
|| flag == "-target" || flag == "-gcc-toolchain" || flag == "-isystem")
&& i < flags.size() - 1) {
arguments << flag << allFlags.at(i + 1); arguments << flag << allFlags.at(i + 1);
++i; ++i;
} }