aboutsummaryrefslogtreecommitdiffstats
path: root/src/shared
diff options
context:
space:
mode:
authorNikita Baryshnikov <nib952051@gmail.com>2018-03-29 18:13:08 +0300
committerNikita Baryshnikov <nib952051@gmail.com>2018-04-12 19:01:00 +0000
commitc18747c8536899765e6e0d45b86390d27d99dd6c (patch)
tree554f01c32a63f11de95b3cdc16453eeaa0c5fc0b /src/shared
parent438b5736d50e69797840305e7bfd0aed0c3223ad (diff)
clang_installation.pri: Don't add default include paths to LLVM_INCLUDEPATH
Full error: In file included from /usr/include/c++/7.3.1/bits/stl_algo.h:59:0, from /usr/include/c++/7.3.1/algorithm:62, from /home/nib/Qt/Latest/include/QtCore/qglobal.h:142, from /home/nib/Qt/Latest/include/QtCore/QtGlobal:1, from /home/nib/soft/qt-creator/src/libs/sqlite/ sqliteglobal.h:30, from /home/nib/soft/qt-creator/src/libs/sqlite/ utf8string.h:28, from /home/nib/soft/qt-creator/src/tools/clangbackend/ source/clangcodecompleteresults.h:30, from /home/nib/soft/qt-creator/src/tools/clangbackend/ source/clangcodecompleteresults.cpp:26: /usr/include/c++/7.3.1/cstdlib:75:15: fatal error: stdlib.h: No such file or directory #include_next <stdlib.h> ^~~~~~~~~~ Change-Id: I590f95b201dc5e3e0ad44f8d2e580b380f31bd7c Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/clang/clang_installation.pri3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri
index 63ad0ad538c..a41c118ebd8 100644
--- a/src/shared/clang/clang_installation.pri
+++ b/src/shared/clang/clang_installation.pri
@@ -144,7 +144,6 @@ isEmpty(LLVM_VERSION) {
versionIsEqual($$LLVM_VERSION, 5, 0)|!isEmpty(QTC_FORCE_CLANG_LIBTOOLING) {
!contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS = -L$${LLVM_LIBDIR}
LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS
- contains(QMAKE_DEFAULT_INCDIRS, $$LLVM_INCLUDEPATH): LLVM_INCLUDEPATH =
} else {
warning("Clang LibTooling is disabled because only version 5.0 is supported.")
}
@@ -152,6 +151,8 @@ isEmpty(LLVM_VERSION) {
warning("Clang LibTooling is disabled.")
}
+ contains(QMAKE_DEFAULT_INCDIRS, $$LLVM_INCLUDEPATH): LLVM_INCLUDEPATH =
+
# Remove unwanted flags. It is a workaround for linking.
# It is not intended for cross compiler linking.
LLVM_CXXFLAGS = $$system($$llvm_config --cxxflags, lines)