No longer assume that flags are present when removing them in exporters

Author: theotherjimmy

tools/export/iar.py

@@ -20,6 +20,7 @@
 
 from tools.export.exporters import Exporter, ExporterTargetsProperty
 from tools.targets import TARGET_MAP, TARGET_NAMES
+from tools.utils import remove_when_present
 
 # If you wish to add a new target, add it to project_generator_definitions, and then
 # define progen_target name in the target class (`` self.progen_target = 'my_target_name' ``)
@@ -63,7 +64,7 @@ def generate(self):
 
         project_data['misc'] = self.flags
         # VLA is enabled via template IccAllowVLA
-        project_data['misc']['c_flags'].remove("--vla")
+        remove_when_present(project_data['misc']['c_flags'], ("--vla"))
         project_data['build_dir'] = os.path.join(project_data['build_dir'], 'iar_arm')
         self.progen_gen_file(project_data)
 

tools/export/uvision4.py

@@ -19,6 +19,7 @@
 
 from tools.export.exporters import Exporter, ExporterTargetsProperty
 from tools.targets import TARGET_MAP, TARGET_NAMES
+from tools.utils import remove_when_present
 
 # If you wish to add a new target, add it to project_generator_definitions, and then
 # define progen_target name in the target class (`` self.progen_target = 'my_target_name' ``)
@@ -84,11 +85,11 @@ def generate(self):
                                                    + self.flags['c_flags']
                                                    + self.flags['cxx_flags']))
         # not compatible with c99 flag set in the template
-        project_data['misc']['c_flags'].remove("--c99")
+        remove_when_present(project_data['misc']['c_flags'], "--c99")
         # cpp is not required as it's implicit for cpp files
-        project_data['misc']['c_flags'].remove("--cpp")
+        remove_when_present(project_data['misc']['c_flags'], "--cpp")
         # we want no-vla for only cxx, but it's also applied for C in IDE, thus we remove it
-        project_data['misc']['c_flags'].remove("--no_vla")
+        remove_when_present(project_data['misc']['c_flags'], "--no_vla")
         project_data['misc']['ld_flags'] = self.flags['ld_flags']
 
         project_data['build_dir'] = project_data['build_dir'] + '\\' + 'uvision4'

tools/export/uvision5.py

@@ -19,6 +19,7 @@
 
 from tools.export.exporters import Exporter, ExporterTargetsProperty
 from tools.targets import TARGET_MAP, TARGET_NAMES
+from tools.utils import remove_when_present
 
 # If you wish to add a new target, add it to project_generator_definitions, and then
 # define progen_target name in the target class (`` self.progen_target = 'my_target_name' ``)
@@ -84,11 +85,11 @@ def generate(self):
                                                    + self.flags['c_flags']
                                                    + self.flags['cxx_flags']))
         # not compatible with c99 flag set in the template
-        project_data['misc']['c_flags'].remove("--c99")
+        remove_when_present(project_data['misc']['c_flags'], ("--c99"))
         # cpp is not required as it's implicit for cpp files
-        project_data['misc']['c_flags'].remove("--cpp")
+        remove_when_present(project_data['misc']['c_flags'], ("--cpp"))
         # we want no-vla for only cxx, but it's also applied for C in IDE, thus we remove it
-        project_data['misc']['c_flags'].remove("--no_vla")
+        remove_when_present(project_data['misc']['c_flags'], ("--no_vla"))
         project_data['misc']['ld_flags'] = self.flags['ld_flags']
 
         i = 0

tools/utils.py

@@ -470,3 +470,7 @@ def parse_type(not_parent):
         else:
             return not_parent
     return parse_type
+
+def remove_when_present(list, thing):
+    if thing in list:
+        list.remove(thing)