diff options
Diffstat (limited to 'sources/shiboken2')
-rw-r--r-- | sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp | 18 | ||||
-rw-r--r-- | sources/shiboken2/shiboken_version.py | 2 |
2 files changed, 8 insertions, 12 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 diff --git a/sources/shiboken2/shiboken_version.py b/sources/shiboken2/shiboken_version.py index 88792a380..290c1dc12 100644 --- a/sources/shiboken2/shiboken_version.py +++ b/sources/shiboken2/shiboken_version.py @@ -39,7 +39,7 @@ major_version = "5" minor_version = "15" -patch_version = "11" +patch_version = "12" # For example: "a", "b", "rc" # (which means "alpha", "beta", "release candidate"). |