Skip to content

Commit 89b6c41

Browse files
committed
uvision5 - add flags from uvision toolchain class
Flags should be unique, thus use list(set()) to remove duplicates
1 parent 5ce3ec9 commit 89b6c41

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

workspace_tools/export/uvision4.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ def generate(self):
6767

6868
# get flags from toolchain and apply
6969
project_data['tool_specific']['uvision']['misc'] = {}
70-
project_data['tool_specific']['uvision']['misc']['asm_flags'] = self.toolchain.flags['common'] + self.toolchain.flags['asm']
71-
project_data['tool_specific']['uvision']['misc']['c_flags'] = self.toolchain.flags['common'] + self.toolchain.flags['c']
70+
project_data['tool_specific']['uvision']['misc']['asm_flags'] = list(set(self.toolchain.flags['common'] + self.toolchain.flags['asm']))
71+
project_data['tool_specific']['uvision']['misc']['c_flags'] = list(set(self.toolchain.flags['common'] + self.toolchain.flags['c']))
7272
# not compatible with c99 flag set in the template
7373
project_data['tool_specific']['uvision']['misc']['c_flags'].remove("--c99")
74-
project_data['tool_specific']['uvision']['misc']['cxx_flags'] = self.toolchain.flags['common'] + self.toolchain.flags['ld']
74+
project_data['tool_specific']['uvision']['misc']['cxx_flags'] = list(set(self.toolchain.flags['common'] + self.toolchain.flags['ld']))
7575
project_data['tool_specific']['uvision']['misc']['ld_flags'] = self.toolchain.flags['ld']
7676

7777
i = 0

workspace_tools/export/uvision5.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,16 @@ def generate(self):
6464

6565
project_data['tool_specific'] = {}
6666
project_data['tool_specific'].update(tool_specific)
67+
68+
# get flags from toolchain and apply
69+
project_data['tool_specific']['uvision5']['misc'] = {}
70+
project_data['tool_specific']['uvision5']['misc']['asm_flags'] = list(set(self.toolchain.flags['common'] + self.toolchain.flags['asm']))
71+
project_data['tool_specific']['uvision5']['misc']['c_flags'] = list(set(self.toolchain.flags['common'] + self.toolchain.flags['c']))
72+
# not compatible with c99 flag set in the template
73+
project_data['tool_specific']['uvision5']['misc']['c_flags'].remove("--c99")
74+
project_data['tool_specific']['uvision5']['misc']['cxx_flags'] = list(set(self.toolchain.flags['common'] + self.toolchain.flags['ld']))
75+
project_data['tool_specific']['uvision5']['misc']['ld_flags'] = self.toolchain.flags['ld']
76+
6777
i = 0
6878
for macro in project_data['common']['macros']:
6979
# armasm does not like floating numbers in macros, timestamp to int

0 commit comments

Comments
 (0)