Skip to content

Commit a5a5fa3

Browse files
committed
Double escape defines
Fixes a bug where quoting gets stripped by the shell used in the makefile and another bug where the lack of escaping would cause parser errors in eclipse.
1 parent 9b082ff commit a5a5fa3

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tools/export/gnuarmeclipse/.cproject.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
</option>
178178
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs.{{u.id}}" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
179179
{% for s in opts['as']['defines'] %}
180-
<listOptionValue builtIn="false" value="{{s}}"/>
180+
<listOptionValue builtIn="false" value="{{s|replace("\"", "\\\"")|escape}}"/>
181181
{% endfor %}
182182
</option>
183183
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.files.{{u.id}}" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.files" useByScannerDiscovery="true" valueType="includeFiles">
@@ -207,7 +207,7 @@
207207
</option>
208208
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.{{u.id}}" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
209209
{% for s in opts['c']['defines'] %}
210-
<listOptionValue builtIn="false" value="{{s}}"/>
210+
<listOptionValue builtIn="false" value="{{s|replace("\"", "\\\"")|escape}}"/>
211211
{% endfor %}
212212
</option>
213213
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files.{{u.id}}" name="Include files (-include)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files" useByScannerDiscovery="true" valueType="includeFiles">
@@ -255,7 +255,7 @@
255255
</option>
256256
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.defs.{{u.id}}" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
257257
{% for s in opts['cpp']['defines'] %}
258-
<listOptionValue builtIn="false" value="{{s}}"/>
258+
<listOptionValue builtIn="false" value="{{s|replace("\"", "\\\"")|escape}}"/>
259259
{% endfor %}
260260
</option>
261261
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.files.{{u.id}}" name="Include files (-include)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.files" useByScannerDiscovery="true" valueType="includeFiles">

0 commit comments

Comments
 (0)