Skip to content

Commit fed50f8

Browse files
committed
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.
1 parent ac34f29 commit fed50f8

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

tools/export/exporters.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ def progen_flags(self):
6262
if self.config_header:
6363
self._progen_flag_cache['c_flags'] += self.toolchain.get_config_option(self.config_header)
6464
self._progen_flag_cache['cxx_flags'] += self.toolchain.get_config_option(self.config_header)
65+
self._progen_flag_cache['asm_flags'] += self.toolchain.get_config_option(self.config_header)
6566
return self._progen_flag_cache
6667

6768
def __scan_and_copy(self, src_path, trg_path):

tools/export/iar.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ def generate(self, progen_build=False):
7676
project_data['tool_specific']['iar'].setdefault("misc", {})
7777
project_data['tool_specific']['iar'].update(tool_specific['iar'])
7878
project_data['tool_specific']['iar']['misc'].update(self.progen_flags)
79+
project_data['tool_specific']['iar']['misc']['asm_flags'].remove(
80+
self.toolchain.get_config_option(self.config_header)[0])
7981
# VLA is enabled via template IccAllowVLA
8082
project_data['tool_specific']['iar']['misc']['c_flags'].remove("--vla")
8183
project_data['common']['build_dir'] = os.path.join(project_data['common']['build_dir'], 'iar_arm')

0 commit comments

Comments
 (0)