aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2025-11-14 11:22:06 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2025-11-19 22:42:39 +0000
commit52ab15a9a61d6c9c1c670e6719f3bb40f04aa4c6 (patch)
tree5fc9178e4becd90747dd1f2e6109cb1e2c44945e
parent27c8a1cfbae17b312ee3bfca12191339fce89553 (diff)
shiboken6/compilersupport: Fix building on Yocto using clang++6.10
Remove the option -nostdinc, which causes it to complain about "'type_traits' file not found". The option was apparently added for historic reasons and is apparently no longer needed. Fixes: PYSIDE-3235 Change-Id: I3ab4bd9bf1e523e2c6ab6e655ef8d2cc4e865599 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit ff516322980df82cffa6b37a9b410ad87833f709) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp
index a482c3a60..a847ef70c 100644
--- a/sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp
+++ b/sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp
@@ -491,16 +491,10 @@ QByteArrayList detectVulkan()
// For MSVC, we set the MS compatibility version and let Clang figure out its own
// options and include paths.
-// For the others, we pass "-nostdinc" since libclang tries to add it's own system
-// include paths, which together with the clang compiler paths causes some clash
-// which causes std types not being found and construct -I/-F options from the
-// include paths of the host compiler.
-
-static QByteArray noStandardIncludeOption() { return QByteArrayLiteral("-nostdinc"); }
// The clang builtin includes directory is used to find the definitions for
// intrinsic functions and builtin types. It is necessary to use the clang
-// includes to prevent redefinition errors. The default toolchain includes
+// includes to prevent rqedefinition errors. The default toolchain includes
// should be picked up automatically by clang without specifying
// them implicitly.
@@ -653,7 +647,6 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level)
case Compiler::Clang:
headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s),
_compilerArguments));
- result.append(noStandardIncludeOption());
break;
case Compiler::Gpp:
if (needsClangBuiltinIncludes())