diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-07-31 09:49:34 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-07-31 08:52:04 +0000 |
| commit | c6b9f406152e160747a4287a5faa4ce86c9c9fe6 (patch) | |
| tree | f50d26f270d8da1607c12264452e828c4246bb21 /src/plugins/projectexplorer/gcctoolchain.cpp | |
| parent | be67ee75c5bd8b537c578ec024722374b472f9fd (diff) | |
Fix missing built-in header paths for iOS
In cc9d246b028c518d1fc01fc8318f0945949040d3 we started passing "-target"
to Clang when retrieving built-in header paths, but Clang doesn't like
that for iOS targets if we do not also pass the target architecture.
Fixes: QTCREATORBUG-22784
Change-Id: I007bba8ff14d7f303d84db2c803165ba789a5531
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
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 9515668afa3..e9c683e21d3 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -533,7 +533,8 @@ QStringList GccToolChain::gccPrepareArguments(const QStringList &flags, || flag.startsWith("-B") || flag.startsWith("--target=") || (flag.startsWith("-isystem") && flag.length() > 8)) { arguments << flag; - } else if ((flag == "-target" || flag == "-gcc-toolchain" || flag == "-isystem") + } else if ((flag == "-target" || flag == "-gcc-toolchain" || flag == "-isystem" + || flag == "-arch") && i < flags.size() - 1) { arguments << flag << allFlags.at(i + 1); ++i; |