ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed incorrect clean_flags method and float-abi linker option for CCES exporter.

pull/7109/head
Mike Harrington 2018-05-24 16:48:29 -04:00 committed by adbridge
parent e664e5c88a
commit 7cc6e25d02
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/export/cces/__init__.py
View File

@ -108,14 +108,14 @@ class CCES(Exporter):
return CCES.format_path(path, "PARENT-1-PROJECT_LOC/") return CCES.format_path(path, "PARENT-1-PROJECT_LOC/")
@staticmethod @staticmethod
def clean_flags(container, flags): def clean_flags(container, flags_to_remove):
""" """
Some flags are handled by CCES already, so there's no need Some flags are handled by CCES already, so there's no need
to include them twice. to include them twice.
""" """
for flag in container: for flag in flags_to_remove:
if flag in flags: if flag in container:
flags.remove(flag) container.remove(flag)
@staticmethod @staticmethod
def parse_flags(flags, options, booleans): def parse_flags(flags, options, booleans):

6
tools/export/cces/cces.json.tmpl
View File

@ -91,9 +91,9 @@
] ]
}, },
{% if float_abi %} {% if float_abi %}
"-mfloat-abi=${value}" : { "arm.toolchain.gcc.cpp.linker.option.fpu.abi" : {
"type" : "command", "type" : "baseId",
"value" : "{{ float_abi }}" "value" : "arm.toolchain.gcc.c.linker.option.fpu.abi.{{ float_abi }}"
}, },
{% endif %} {% endif %}
"-T" : { "-T" : {