Skip to content

Commit 5dbdf93

Browse files
authored
Merge pull request #2359 from sarahmarshy/armasm_fix
Removed preinclude config from asm flags
2 parents 34caf43 + b910cfe commit 5dbdf93

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

tools/export/exporters.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ 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)
6665
return self._progen_flag_cache
6766

6867
def __scan_and_copy(self, src_path, trg_path):

tools/export/iar.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ 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])
8179
project_data['tool_specific']['iar']['misc']['asm_flags'].extend(
8280
['-D%s' % d for d in self.toolchain.get_symbols()])
8381
# VLA is enabled via template IccAllowVLA

0 commit comments

Comments
 (0)