Skip to content

Commit d9b978f

Browse files
ajaakkohadbridge
authored andcommitted
export: Invalid linker script path in Sw4STM32
Fixed invalid linker script path in project file. Using 'defines' instead of 'symbols' in compiler options.
1 parent deb9c1b commit d9b978f

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

tools/export/sw4stm32/cproject_common.tmpl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
{% endfor %}
4444
</option>
4545
<option id="gnu.c.compiler.option.preprocessor.def.symbols.{{u.id}}" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
46-
{% for s in symbols %}
46+
{% for s in opts['c']['defines'] %}
4747
<listOptionValue builtIn="false" value="{{s}}"/>
4848
{% endfor %}
4949
</option>
@@ -125,7 +125,7 @@
125125
{% endfor %}
126126
</option>
127127
<option id="gnu.cpp.compiler.option.preprocessor.def.{{u.id}}" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
128-
{% for s in symbols %}
128+
{% for s in opts['cpp']['defines'] %}
129129
<listOptionValue builtIn="false" value="{{s}}"/>
130130
{% endfor %}
131131
</option>
@@ -192,7 +192,7 @@
192192
<inputType id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.s.{{u.id}}" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.s"/>
193193
</tool>
194194
<tool id="fr.ac6.managedbuild.tool.gnu.cross.cpp.linker.{{u.id}}" name="MCU G++ Linker" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.linker">
195-
<option id="fr.ac6.managedbuild.tool.gnu.cross.cpp.linker.script.{{u.id}}" name="Linker Script (-T)" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.linker.script" value="${workspace_loc:/${ProjName}/{{opts['ld']['script']}}}" valueType="string"/>
195+
<option id="fr.ac6.managedbuild.tool.gnu.cross.cpp.linker.script.{{u.id}}" name="Linker Script (-T)" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.linker.script" value="${ProjDirPath}/{{opts['name']}}/{{opts['ld']['script']}}" valueType="string"/>
196196
{% if opts['ld']['flags'] != '' %}
197197
<option id="gnu.cpp.link.option.flags.{{u.id}}" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="{{ opts['ld']['flags']|join(' ') }}" valueType="string"/>
198198
{% endif %}
@@ -256,6 +256,7 @@
256256
<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/{{path}}&quot;"/>
257257
{% endfor %}
258258
</option>
259+
<option id="gnu.both.asm.option.flags.{{u.id}}" superClass="gnu.both.asm.option.flags" useByScannerDiscovery="false" value="{{opts['as']['other']}}" valueType="string"/>
259260
{% for item in opts['as']['otherwarnings'] %}
260261
{% if item == '-W' %}
261262
<option id="gnu.both.asm.option.warnings.nowarn.{{u.id}}" superClass="gnu.both.asm.option.warnings.nowarn" useByScannerDiscovery="false" value="true" valueType="boolean"/>

0 commit comments

Comments
 (0)