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

Fix a few flag-related things

pull/7569/head
Jimmy Brisson 2018-08-08 09:52:49 -05:00
parent 1eb47934eb
commit 0924d6618e
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/export/exporters.py
View File

@ -112,10 +112,10 @@ class Exporter(object):
flags['cxx_flags'] += c_defines flags['cxx_flags'] += c_defines
config_header = self.config_header_ref config_header = self.config_header_ref
if config_header: if config_header:
flags['c_flags'] += self.toolchain.get_config_option( config_option = self.toolchain.get_config_option(
config_header.name)
flags['cxx_flags'] += self.toolchain.get_config_option(
config_header.name) config_header.name)
flags['c_flags'] += config_option
flags['cxx_flags'] += config_option
return flags return flags
@property @property

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

@ -178,8 +178,8 @@ 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( config_header = self.config_header_ref
self.toolchain.get_config_header()) config_option = self.toolchain.get_config_option(config_header.name)
c_flags = set( c_flags = set(
flags['c_flags'] + flags['cxx_flags'] + flags['common_flags'] flags['c_flags'] + flags['cxx_flags'] + flags['common_flags']
) )
@ -189,17 +189,18 @@ class Uvision(Exporter):
def valid_flag(x): def valid_flag(x):
return ( return (
x not in in_template or x not in in_template and
not x.startswith("-O") or not x.startswith("-O") and
not x.startswith("-std") or not x.startswith("-std") and
not x.startswith("-D") not x.startswith("-D")
) )
def is_define(s): def is_define(s):
return s.startswith("-D") and "(" not in s return s.startswith("-D") and "(" not in s
flags['c_flags'] = " ".join(f.replace('"', '\\"') for f in c_flags flags['c_flags'] = " ".join(
if (valid_flag(f) and not is_define(f))) f.replace('"', '\\"') for f in c_flags if valid_flag(f)
)
flags['c_flags'] += " " flags['c_flags'] += " "
flags['c_flags'] += " ".join(config_option) 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))