diff options
author | Simo Fält <simo.falt@qt.io> | 2023-06-29 15:20:55 +0300 |
---|---|---|
committer | Simo Fält <simo.falt@qt.io> | 2023-06-29 15:20:55 +0300 |
commit | b642cfa372ca04f8a09f2bc94f8718ab23911ac1 (patch) | |
tree | 2fd835879b5f74490b9704c36c5b4742bcacb9e1 /sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp | |
parent | 568797c36a73aecce050fd198353f31aa986bff9 (diff) | |
parent | ae79fb4f865386ce28707e2abb93cb46aa0c3195 (diff) |
Merge tag 'v5.15.12-lts' into tqtc/lts-5.15-opensourcev5.15.12-lts-lgpl
Qt For Python Release 5.15.12
Change-Id: I6bb1407a6766d4a7dd639873feef65966bd6a1e0
Diffstat (limited to 'sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp')
-rw-r--r-- | sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp index 0b58cf5a5..02b4614a4 100644 --- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp +++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp @@ -345,17 +345,13 @@ QByteArrayList emulatedCompilerOptions() appendClangBuiltinIncludes(&headerPaths); # endif // NEED_CLANG_BUILTIN_INCLUDES - // Append the c++ include paths since Clang is unable to find <list> etc - // on RHEL 7 with g++ 6.3 or CentOS 7.2. - // A fix for this has been added to Clang 5.0, so, the code can be removed - // once Clang 5.0 is the minimum version. - if (needsGppInternalHeaders()) { - const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(QStringLiteral("g++"))); - for (const HeaderPath &h : gppPaths) { - if (h.path.contains("c++") - || h.path.contains("sysroot")) { // centOS - headerPaths.append(h); - } + // Append the c++ include paths since Clang is unable to find + // <type_traits> etc (g++ 11.3). + const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(QStringLiteral("g++"))); + for (const HeaderPath &h : gppPaths) { + if (h.path.contains("c++") + || h.path.contains("sysroot")) { // centOS + headerPaths.append(h); } } #else |