From 62e776aa8ed54bf448e355a55cf4f0e6c4579877 Mon Sep 17 00:00:00 2001
From: Ivan Donchevskii <ivan.donchevskii@qt.io>
Date: Tue, 7 Aug 2018 15:21:20 +0200
Subject: Clang: Provide include directory only for libclang

Only libclang has issues with the include directory
search therefore undefining include folders makes sense
only for libclang options builder.

Change-Id: Ie3f62f5f3a89503e6e0ab59e18889e92425c3abc
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
---
 src/plugins/cpptools/compileroptionsbuilder.cpp | 30 +------------------------
 src/plugins/cpptools/compileroptionsbuilder.h   |  7 +-----
 2 files changed, 2 insertions(+), 35 deletions(-)

(limited to 'src/plugins/cpptools')

diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index 0eb940dcca..5e5721dc7c 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -39,14 +39,8 @@
 
 namespace CppTools {
 
-static constexpr char SYSTEM_INCLUDE_PREFIX[] = "-isystem";
-
-CompilerOptionsBuilder::CompilerOptionsBuilder(const ProjectPart &projectPart,
-                                               const QString &clangVersion,
-                                               const QString &clangResourceDirectory)
+CompilerOptionsBuilder::CompilerOptionsBuilder(const ProjectPart &projectPart)
     : m_projectPart(projectPart)
-    , m_clangVersion(clangVersion)
-    , m_clangResourceDirectory(clangResourceDirectory)
 {
 }
 
@@ -500,31 +494,9 @@ bool CompilerOptionsBuilder::excludeHeaderPath(const QString &headerPath) const
 
 void CompilerOptionsBuilder::addPredefinedHeaderPathsOptions()
 {
-    add("-nostdinc");
-    add("-nostdlibinc");
-
     // In case of MSVC we need builtin clang defines to correctly handle clang includes
     if (m_projectPart.toolchainType != ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)
         add("-undef");
-
-    addClangIncludeFolder();
-}
-
-static QString clangIncludeDirectory(const QString &clangVersion,
-                                     const QString &clangResourceDirectory)
-{
-#ifndef UNIT_TESTS
-    return Core::ICore::clangIncludeDirectory(clangVersion, clangResourceDirectory);
-#else
-    return QString();
-#endif
-}
-
-void CompilerOptionsBuilder::addClangIncludeFolder()
-{
-    QTC_CHECK(!m_clangVersion.isEmpty());
-    add(SYSTEM_INCLUDE_PREFIX);
-    add(clangIncludeDirectory(m_clangVersion, m_clangResourceDirectory));
 }
 
 void CompilerOptionsBuilder::addProjectConfigFileInclude()
diff --git a/src/plugins/cpptools/compileroptionsbuilder.h b/src/plugins/cpptools/compileroptionsbuilder.h
index 35cd2ce57a..33a72820e4 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.h
+++ b/src/plugins/cpptools/compileroptionsbuilder.h
@@ -39,9 +39,7 @@ public:
         Use
     };
 
-    CompilerOptionsBuilder(const ProjectPart &projectPart,
-                           const QString &clangVersion = QString(),
-                           const QString &clangResourceDirectory = QString());
+    CompilerOptionsBuilder(const ProjectPart &projectPart);
     virtual ~CompilerOptionsBuilder() {}
 
     virtual void addTargetTriple();
@@ -90,11 +88,8 @@ private:
     QByteArray macroOption(const ProjectExplorer::Macro &macro) const;
     QByteArray toDefineOption(const ProjectExplorer::Macro &macro) const;
     QString defineDirectiveToDefineOption(const ProjectExplorer::Macro &marco) const;
-    void addClangIncludeFolder();
 
     QStringList m_options;
-    QString m_clangVersion;
-    QString m_clangResourceDirectory;
 };
 
 } // namespace CppTools
-- 
cgit v1.2.1