Merge pull request #1933 from 0xc0170/fix_uvision_cpp

uvision - remove --cpp flag from exporters

Author: 0xc0170

tools/export/uvision4.py

@@ -76,6 +76,8 @@ def generate(self):
         project_data['tool_specific']['uvision']['misc']['c_flags'].remove("--c99")
         # ARM_INC is by default as system inclusion, not required for exported project
         project_data['tool_specific']['uvision']['misc']['c_flags'].remove("-I \""+ARM_INC+"\"")
+        # cpp is not required as it's implicit for cpp files
+        project_data['tool_specific']['uvision']['misc']['c_flags'].remove("--cpp")
         project_data['tool_specific']['uvision']['misc']['ld_flags'] = self.toolchain.flags['ld']
 
         i = 0

tools/export/uvision5.py

@@ -71,8 +71,12 @@ def generate(self):
         project_data['tool_specific']['uvision5']['misc']['asm_flags'] = list(set(self.toolchain.flags['asm']))
         # cxx flags included, as uvision have them all in one tab
         project_data['tool_specific']['uvision5']['misc']['c_flags'] = list(set(self.toolchain.flags['common'] + self.toolchain.flags['c'] + self.toolchain.flags['cxx']))
+        # ARM_INC is by default as system inclusion, not required for exported project
+        project_data['tool_specific']['uvision']['misc']['c_flags'].remove("-I \""+ARM_INC+"\"")
         # not compatible with c99 flag set in the template
         project_data['tool_specific']['uvision5']['misc']['c_flags'].remove("--c99")
+        # cpp is not required as it's implicit for cpp files
+        project_data['tool_specific']['uvision']['misc']['c_flags'].remove("--cpp")
         project_data['tool_specific']['uvision5']['misc']['ld_flags'] = self.toolchain.flags['ld']
 
         i = 0