diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-08-15 08:57:27 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-08-15 08:57:27 +0200 |
| commit | 8201d49ea07fe83eecf6694d690c49ea314d52ca (patch) | |
| tree | 18149155174beaf7ea92b1de1e9c406c0c7a0fa2 /src/plugins/projectexplorer/gcctoolchain.cpp | |
| parent | 40921421ae7d6ad7c7644e0f7ffe900ccd70ee5e (diff) | |
| parent | 85cb98148670f0c74944cb79d093a4342966543f (diff) | |
Merge remote-tracking branch 'origin/4.10'
Change-Id: I4d24269ef040c45e2143dfa86d1be3f7e8008521
Diffstat (limited to 'src/plugins/projectexplorer/gcctoolchain.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/gcctoolchain.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index a2966ffe964..01e4e42608b 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -524,7 +524,8 @@ QStringList GccToolChain::gccPrepareArguments(const QStringList &flags, const QString &flag = allFlags.at(i); if (flag.startsWith("-stdlib=") || flag.startsWith("--gcc-toolchain=") || flag.startsWith("-B") || flag.startsWith("--target=") - || (flag.startsWith("-isystem") && flag.length() > 8)) { + || (flag.startsWith("-isystem") && flag.length() > 8) + || flag == "-nostdinc" || flag == "-nostdinc++") { arguments << flag; } else if ((flag == "-target" || flag == "-gcc-toolchain" || flag == "-isystem" || flag == "-arch") |