From 29a67b57e54fe9bc1afbb0f704c173704e11b067 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Tue, 19 May 2020 18:00:39 +0300 Subject: BareMetal: Save 'platform codegen flags' for Keil compiler Previous commit 071f998 skipped {re}storing of the platform codegen flags in the Keil compiler. Change-Id: I483f92a15017ba0471691d25685a2a8e9bd7d93c Reviewed-by: hjk --- src/plugins/baremetal/keiltoolchain.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp index 903118e757..208752f346 100644 --- a/src/plugins/baremetal/keiltoolchain.cpp +++ b/src/plugins/baremetal/keiltoolchain.cpp @@ -61,6 +61,7 @@ namespace Internal { // Helpers: static const char compilerCommandKeyC[] = "BareMetal.KeilToolchain.CompilerPath"; +static const char compilerPlatformCodeGenFlagsKeyC[] = "BareMetal.KeilToolchain.PlatformCodeGenFlags"; static const char targetAbiKeyC[] = "BareMetal.KeilToolchain.TargetAbi"; static bool compilerExists(const FilePath &compilerPath) @@ -534,6 +535,7 @@ QVariantMap KeilToolChain::toMap() const { QVariantMap data = ToolChain::toMap(); data.insert(compilerCommandKeyC, m_compilerCommand.toString()); + data.insert(compilerPlatformCodeGenFlagsKeyC, m_extraCodeModelFlags); data.insert(targetAbiKeyC, m_targetAbi.toString()); return data; } @@ -543,6 +545,7 @@ bool KeilToolChain::fromMap(const QVariantMap &data) if (!ToolChain::fromMap(data)) return false; m_compilerCommand = FilePath::fromString(data.value(compilerCommandKeyC).toString()); + m_extraCodeModelFlags = data.value(compilerPlatformCodeGenFlagsKeyC).toStringList(); m_targetAbi = Abi::fromString(data.value(targetAbiKeyC).toString()); return true; } -- cgit v1.2.1