feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Use toolchain macros for IAR toolchain

Browse Source 
...or if requested with QTC_CLANG_USE_TOOLCHAIN_MACROS=1.

Change-Id: I6d2f35b69393a7039271cc651aa514cdb686522e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-11-27 09:05:49 +01:00
committed by hjk
parent 8a2fb30378
commit 5e4f6a9bb3
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cpptools/compileroptionsbuilder.cpp
View File

@@ -28,6 +28,8 @@
#include "cppmodelmanager.h" #include "cppmodelmanager.h"
#include "headerpathfilter.h" #include "headerpathfilter.h"
#include <baremetal/baremetalconstants.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <projectexplorer/headerpath.h> #include <projectexplorer/headerpath.h>
@@ -352,6 +354,11 @@ void CompilerOptionsBuilder::addPrecompiledHeaderOptions(UsePrecompiledHeaders u
void CompilerOptionsBuilder::addProjectMacros() 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); addMacros(m_projectPart.projectMacros);
} }