File tree Expand file tree Collapse file tree 2 files changed +13
-3
lines changed Expand file tree Collapse file tree 2 files changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -67,11 +67,11 @@ def generate(self):
67
67
68
68
# get flags from toolchain and apply
69
69
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' ]))
72
72
# not compatible with c99 flag set in the template
73
73
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' ]))
75
75
project_data ['tool_specific' ]['uvision' ]['misc' ]['ld_flags' ] = self .toolchain .flags ['ld' ]
76
76
77
77
i = 0
Original file line number Diff line number Diff line change @@ -64,6 +64,16 @@ def generate(self):
64
64
65
65
project_data ['tool_specific' ] = {}
66
66
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
+
67
77
i = 0
68
78
for macro in project_data ['common' ]['macros' ]:
69
79
# armasm does not like floating numbers in macros, timestamp to int
You can’t perform that action at this time.
0 commit comments