Meson Github pull request - 3186 requested changes

- Fixing flake8 error in compilers.py - [E124] closing bracket does not match visual indentation
- Updating ARMCCompiler constructor in c.py to raise error as per comments

cross/armcc.txt

@@ -0,0 +1,11 @@
+[binaries]
+c = 'armcc'
+cpp = 'armcc'
+ar = 'armar'
+strip = 'armar'
+
+[host_machine]
+system = 'WINDOWS'
+cpu_family = 'arm'
+cpu = 'Cortex-M0+'
+endian = 'little'

mesonbuild/compilers/c.py

@@ -891,6 +891,9 @@ class GnuCCompiler(GnuCompiler, CCompiler):
 
 class ARMCCompiler(ARMCompiler, CCompiler):
     def __init__(self, exelist, version, is_cross, exe_wrapper=None, defines=None, **kwargs):
+        # ARMCC is only a cross compiler
+        if not is_cross:
+            raise EnvironmentException('armcc supports only cross-compilation.')
         CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs)
         ARMCompiler.__init__(self, defines)
 

mesonbuild/compilers/compilers.py

@@ -112,12 +112,13 @@ gnulike_buildtype_args = {'plain': [],
                           'debugoptimized': ['-O2', '-g'],
                           'release': ['-O3'],
                           'minsize': ['-Os', '-g']}
+
 arm_buildtype_args = {'plain': [],
                       'debug': ['-O0', '-g'],
                       'debugoptimized': ['-O2', '-g'],
                       'release': ['-O2'],
                       'minsize': ['-Os', '-g'],
-                     }
+                      }
 
 msvc_buildtype_args = {'plain': [],
                        'debug': ["/MDd", "/ZI", "/Ob0", "/Od", "/RTC1"],
@@ -139,12 +140,13 @@ gnulike_buildtype_linker_args = {'plain': [],
                                  'release': ['-Wl,-O1'],
                                  'minsize': [],
                                  }
+
 arm_buildtype_linker_args = {'plain': [],
                              'debug': [],
                              'debugoptimized': [],
                              'release': [],
                              'minsize': [],
-                            }
+                             }
 
 msvc_buildtype_linker_args = {'plain': [],
                               'debug': [],