File tree Expand file tree Collapse file tree 9 files changed +12
-13
lines changed Expand file tree Collapse file tree 9 files changed +12
-13
lines changed Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ def generate(self):
69
69
'library_paths' : self .resources .lib_dirs ,
70
70
'linker_script' : self .resources .linker_script ,
71
71
'libraries' : libraries ,
72
- 'symbols' : self .get_symbols (),
72
+ 'symbols' : self .toolchain . get_symbols (),
73
73
'solution_uuid' : solution_uuid .upper (),
74
74
'project_uuid' : project_uuid .upper ()
75
75
}
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ def generate(self):
53
53
'linker_script' : self .resources .linker_script ,
54
54
'object_files' : self .resources .objects ,
55
55
'libraries' : libraries ,
56
- 'symbols' : self .get_symbols ()
56
+ 'symbols' : self .toolchain . get_symbols ()
57
57
}
58
58
ctx .update (self .flags )
59
59
self .gen_file ('codered_%s_project.tmpl' % self .target .lower (), ctx , '.project' )
Original file line number Diff line number Diff line change @@ -106,7 +106,7 @@ def generate(self):
106
106
'library_paths' : self .resources .lib_dirs ,
107
107
'object_files' : self .resources .objects ,
108
108
'libraries' : libraries ,
109
- 'symbols' : self .get_symbols ()
109
+ 'symbols' : self .toolchain . get_symbols ()
110
110
}
111
111
target = self .target .lower ()
112
112
Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ def generate(self):
59
59
'scatter_file' : self .resources .linker_script ,
60
60
'object_files' : self .resources .objects + self .resources .libraries ,
61
61
'source_files' : source_files ,
62
- 'symbols' : self .get_symbols ()
62
+ 'symbols' : self .toolchain . get_symbols ()
63
63
}
64
64
target = self .target .lower ()
65
65
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ def generate(self):
39
39
40
40
'object_files' : self .resources .objects ,
41
41
'libraries' : libraries ,
42
- 'symbols' : self .get_symbols ()
42
+ 'symbols' : self .toolchain . get_symbols ()
43
43
}
44
44
self .gen_file ('e2studio_%s_project.tmpl' % self .target .lower (), ctx , '.project' )
45
45
self .gen_file ('e2studio_%s_cproject.tmpl' % self .target .lower (), ctx , '.cproject' )
Original file line number Diff line number Diff line change @@ -68,12 +68,12 @@ def generate(self):
68
68
'script_file' : self .resources .linker_script ,
69
69
'library_paths' : self .resources .lib_dirs ,
70
70
'libraries' : libraries ,
71
- 'symbols' : self .get_symbols (),
71
+ 'symbols' : self .toolchain . get_symbols (),
72
72
'object_files' : self .resources .objects ,
73
73
'sys_libs' : self .toolchain .sys_libs ,
74
- 'cc_org' : self .flags ['common ' ] + self .flags ['c ' ],
75
- 'ld_org' : self .flags ['common ' ] + self .flags ['ld ' ],
76
- 'cppc_org' : self .flags ['common ' ] + self .flags ['cxx ' ]
74
+ 'cc_org' : self .flags ['common_flags ' ] + self .flags ['c_flags ' ],
75
+ 'ld_org' : self .flags ['common_flags ' ] + self .flags ['ld_flags ' ],
76
+ 'cppc_org' : self .flags ['common_flags ' ] + self .flags ['cxx_flags ' ]
77
77
}
78
78
79
79
# EmBlocks intermediate file template
Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ def generate(self):
40
40
'linker_script' : self .resources .linker_script ,
41
41
'object_files' : self .resources .objects ,
42
42
'libraries' : libraries ,
43
- 'symbols' : self .get_symbols ()
43
+ 'symbols' : self .toolchain . get_symbols ()
44
44
}
45
45
self .gen_file ('kds_%s_project.tmpl' % self .target .lower (), ctx , '.project' )
46
46
self .gen_file ('kds_%s_cproject.tmpl' % self .target .lower (), ctx , '.cproject' )
Original file line number Diff line number Diff line change @@ -147,7 +147,7 @@ def generate(self):
147
147
libraries .append (l [3 :])
148
148
149
149
defines = []
150
- for define in self .get_symbols ():
150
+ for define in self .toolchain . get_symbols ():
151
151
if '=' in define :
152
152
keyval = define .split ('=' )
153
153
defines .append ( (keyval [0 ], keyval [1 ]) )
@@ -165,7 +165,6 @@ def generate(self):
165
165
'library_paths' : self .resources .lib_dirs ,
166
166
'linker_script' : self .resources .linker_script ,
167
167
'libraries' : libraries ,
168
- 'symbols' : self .get_symbols (),
169
168
'defines' : defines ,
170
169
'part' : self .PARTS [self .target ],
171
170
'kit' : self .KITS [self .target ],
Original file line number Diff line number Diff line change @@ -84,7 +84,7 @@ def generate(self):
84
84
'library_paths' : self .resources .lib_dirs ,
85
85
'object_files' : self .resources .objects ,
86
86
'libraries' : libraries ,
87
- 'symbols' : self .get_symbols (),
87
+ 'symbols' : self .toolchain . get_symbols (),
88
88
'board_name' : self .BOARDS [self .target .upper ()]['name' ],
89
89
'mcu_name' : self .BOARDS [self .target .upper ()]['mcuId' ],
90
90
'debug_config_uid' : self .__generate_uid (),
You can’t perform that action at this time.
0 commit comments