Clang: Never use toolchain defines

The known cases provide enough flags not to require
toolchain defines.

Change-Id: Ia7e08a90eca6ea9474db40683ac1e63236f8643d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

1 files changed, 1 insertions, 4 deletions

diff --git a/src/plugins/cpptools/compileroptionsbuilder.h b/src/plugins/cpptools/compileroptionsbuilder.h
index 5d22f9be7b..64c07b5fa3 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.h
+++ b/src/plugins/cpptools/compileroptionsbuilder.h
@@ -45,7 +45,6 @@ class CPPTOOLS_EXPORT CompilerOptionsBuilder
 public:
     CompilerOptionsBuilder(const ProjectPart &projectPart,
                            UseSystemHeader useSystemHeader = UseSystemHeader::No,
-                           UseToolchainMacros useToolchainMacros = UseToolchainMacros::Yes,
                            UseTweakedHeaderPaths useTweakedHeaderPaths = UseTweakedHeaderPaths::Yes,
                            UseLanguageDefines useLanguageDefines = UseLanguageDefines::No,
                            const QString &clangVersion = QString(),
@@ -55,10 +54,9 @@ public:
     QStringList options() const { return m_options; }
 
     // Add options based on project part
-    virtual void addToolchainAndProjectMacros();
+    virtual void addProjectMacros();
     void addSyntaxOnly();
     void addWordWidth();
-    void addToolchainFlags();
     void addHeaderPathOptions();
     void addPrecompiledHeaderOptions(UsePrecompiledHeaders usePrecompiledHeaders);
     void addMacros(const ProjectExplorer::Macros &macros);
@@ -98,7 +96,6 @@ private:
     const ProjectPart &m_projectPart;
 
     const UseSystemHeader m_useSystemHeader;
-    const UseToolchainMacros m_useToolchainMacros;
     const UseTweakedHeaderPaths m_useTweakedHeaderPaths;
     const UseLanguageDefines m_useLanguageDefines;