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

Correct check for in-template flags 

It was named and used as if it were positive logic, and written with
negative logic. This changes the name and usage to negative logic.
pull/7569/head
Jimmy Brisson 2017-10-10 17:02:12 -05:00
parent fa1bf57a4d
commit bafced4099
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/export/uvision/__init__.py
View File

@ -164,11 +164,14 @@ class Uvision(Exporter):
",".join(filter(lambda f: f.startswith("-D"), flags['asm_flags']))) ",".join(filter(lambda f: f.startswith("-D"), flags['asm_flags'])))
flags['asm_flags'] = asm_flag_string flags['asm_flags'] = asm_flag_string
config_option = self.toolchain.get_config_option(
self.toolchain.get_config_header())
c_flags = set( c_flags = set(
flags['c_flags'] + flags['cxx_flags'] + flags['common_flags'] flags['c_flags'] + flags['cxx_flags'] + flags['common_flags']
) )
in_template = set( in_template = set(
["--no_vla", "--cpp", "--c99", "-std=gnu99", "-std=g++98"] ["--no_vla", "--cpp", "--c99", "-std=gnu99", "-std=g++98"] +
config_option
) )
def valid_flag(x): def valid_flag(x):
@ -179,6 +182,8 @@ class Uvision(Exporter):
flags['c_flags'] = " ".join(f.replace('"', '\\"') for f in c_flags flags['c_flags'] = " ".join(f.replace('"', '\\"') for f in c_flags
if (valid_flag(f) and not is_define(f))) if (valid_flag(f) and not is_define(f)))
flags['c_flags'] += " "
flags['c_flags'] += " ".join(config_option)
flags['c_defines'] = " ".join(f[2:] for f in c_flags if is_define(f)) flags['c_defines'] = " ".join(f[2:] for f in c_flags if is_define(f))
flags['ld_flags'] = " ".join(set(flags['ld_flags'])) flags['ld_flags'] = " ".join(set(flags['ld_flags']))
return flags return flags