From fed50f8f18c6bf545df3ab8cfa66ad8bdaaa6a85 Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Thu, 28 Jul 2016 16:30:55 -0500 Subject: [PATCH] Add missing --preinclude and -input on assembly files Except for IAR, it does not support the --preinclude option for assembly files but all of the other exporters can. It was less code to remove it in IAR than to explicitly add it in all of the other exporters. --- tools/export/exporters.py | 1 + tools/export/iar.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tools/export/exporters.py b/tools/export/exporters.py index 1286ac57f9..0b074ef6ea 100644 --- a/tools/export/exporters.py +++ b/tools/export/exporters.py @@ -62,6 +62,7 @@ class Exporter(object): if self.config_header: self._progen_flag_cache['c_flags'] += self.toolchain.get_config_option(self.config_header) self._progen_flag_cache['cxx_flags'] += self.toolchain.get_config_option(self.config_header) + self._progen_flag_cache['asm_flags'] += self.toolchain.get_config_option(self.config_header) return self._progen_flag_cache def __scan_and_copy(self, src_path, trg_path): diff --git a/tools/export/iar.py b/tools/export/iar.py index 5c52a3d1ec..e8f944cded 100644 --- a/tools/export/iar.py +++ b/tools/export/iar.py @@ -76,6 +76,8 @@ class IAREmbeddedWorkbench(Exporter): project_data['tool_specific']['iar'].setdefault("misc", {}) project_data['tool_specific']['iar'].update(tool_specific['iar']) project_data['tool_specific']['iar']['misc'].update(self.progen_flags) + project_data['tool_specific']['iar']['misc']['asm_flags'].remove( + self.toolchain.get_config_option(self.config_header)[0]) # VLA is enabled via template IccAllowVLA project_data['tool_specific']['iar']['misc']['c_flags'].remove("--vla") project_data['common']['build_dir'] = os.path.join(project_data['common']['build_dir'], 'iar_arm')