diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-11-01 14:37:57 +0100 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-11-01 14:16:11 +0000 |
commit | 645f7fc85b813c2d873860eeed3be955a3b61100 (patch) | |
tree | 5beb08645f5349178b5d04fb3872930e1136d88f /src/plugins/cpptools/compileroptionsbuilder.cpp | |
parent | 89fea590998a7424cf10a5f9d98822f424ad3205 (diff) | |
download | qt-creator-645f7fc85b813c2d873860eeed3be955a3b61100.tar.gz |
Clang: Avoid parsing unknown gcc 6 asm output flags
Task-number: QTCREATORBUG-17183
Change-Id: I24321cd97acfa3dd71a3682f14af4816bdd08059
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
-rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index e07d4fcc56..01378ec88e 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -433,6 +433,13 @@ bool CompilerOptionsBuilder::excludeDefineDirective(const QByteArray &defineDire return true; } + // MinGW 6 supports some fancy asm output flags and uses them in an + // intrinsics header pulled in by windows.h. Clang does not know them. + if (m_projectPart.toolchainType == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID + && defineDirective.startsWith("#define __GCC_ASM_FLAG_OUTPUTS__")) { + return true; + } + return false; } |