From bafced40993d7606736a26f8c800e8e81ebaa952 Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Tue, 10 Oct 2017 17:02:12 -0500 Subject: [PATCH] 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. --- tools/export/uvision/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/export/uvision/__init__.py b/tools/export/uvision/__init__.py index b1126215bd..e3d80a50c0 100644 --- a/tools/export/uvision/__init__.py +++ b/tools/export/uvision/__init__.py @@ -164,11 +164,14 @@ class Uvision(Exporter): ",".join(filter(lambda f: f.startswith("-D"), flags['asm_flags']))) flags['asm_flags'] = asm_flag_string + config_option = self.toolchain.get_config_option( + self.toolchain.get_config_header()) c_flags = set( flags['c_flags'] + flags['cxx_flags'] + flags['common_flags'] ) 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): @@ -179,6 +182,8 @@ class Uvision(Exporter): flags['c_flags'] = " ".join(f.replace('"', '\\"') for f in c_flags 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['ld_flags'] = " ".join(set(flags['ld_flags'])) return flags