diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-11-27 09:05:49 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-11-28 15:26:33 +0000 |
| commit | 5e4f6a9bb3138c8e48badda6b2a109cb5fa2bd41 (patch) | |
| tree | 48df065b2b11cd61ac1c03b121c36102f73ae9d3 /src/plugins/cpptools/compileroptionsbuilder.cpp | |
| parent | 8a2fb303788c7e0b40533c7cef28c4a5168c581c (diff) | |
| download | qt-creator-5e4f6a9bb3138c8e48badda6b2a109cb5fa2bd41.tar.gz | |
Clang: Use toolchain macros for IAR toolchain
...or if requested with QTC_CLANG_USE_TOOLCHAIN_MACROS=1.
Change-Id: I6d2f35b69393a7039271cc651aa514cdb686522e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index ee534757ea..1f15ebddda 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -28,6 +28,8 @@ #include "cppmodelmanager.h" #include "headerpathfilter.h" +#include <baremetal/baremetalconstants.h> + #include <coreplugin/icore.h> #include <projectexplorer/headerpath.h> @@ -352,6 +354,11 @@ void CompilerOptionsBuilder::addPrecompiledHeaderOptions(UsePrecompiledHeaders u void CompilerOptionsBuilder::addProjectMacros() { + static const int useMacros = qEnvironmentVariableIntValue("QTC_CLANG_USE_TOOLCHAIN_MACROS"); + + if (m_projectPart.toolchainType == BareMetal::Constants::IAREW_TOOLCHAIN_TYPEID || useMacros) + addMacros(m_projectPart.toolChainMacros); + addMacros(m_projectPart.projectMacros); } |