From 5e4f6a9bb3138c8e48badda6b2a109cb5fa2bd41 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Wed, 27 Nov 2019 09:05:49 +0100
Subject: [PATCH] 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>
---
 src/plugins/cpptools/compileroptionsbuilder.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index ee534757ea1..1f15ebddda7 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);
 }