Merge pull request #7061 from TTornblom/master

Tools: Include configuration in ASM

Author: Cruz Monrreal

tools/export/iar/__init__.py

@@ -112,8 +112,8 @@ def generate(self):
                self.resources.objects + self.libraries
         flags = self.flags
         c_flags = list(set(flags['common_flags']
-                                    + flags['c_flags']
-                                    + flags['cxx_flags']))
+                           + flags['c_flags']
+                           + flags['cxx_flags']))
         # Flags set in template to be set by user in IDE
         template = ["--vla", "--no_static_destruction"]
         # Flag invalid if set in template
@@ -133,7 +133,7 @@ def generate(self):
             'include_paths': [self.format_file(src) for src in self.resources.inc_dirs],
             'device': self.iar_device(),
             'ewp': sep+self.project_name + ".ewp",
-            'debugger': debugger
+            'debugger': debugger,
         }
         ctx.update(flags)
 
@@ -200,5 +200,3 @@ def build(project_name, log_name="build_log.txt", cleanup=True):
             return -1
         else:
             return 0
-
-