Merge pull request #1505 from centricular/dont-use-c++-for-assembly

Try harder to use the C compiler for compiling asm

1 files changed, 3 insertions, 3 deletions

diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 7ee4bb9..0c6d980 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1613,6 +1613,8 @@ class Interpreter(InterpreterBase):
 
     @stringArgs
     def func_project(self, node, args, kwargs):
+        if len(args) < 1:
+            raise InvalidArguments('Not enough arguments to project(). Needs at least the project name.')
         default_options = kwargs.get('default_options', [])
         if self.environment.first_invocation and (len(default_options) > 0 or
                                                   len(self.default_project_options) > 0):
@@ -1625,8 +1627,6 @@ class Interpreter(InterpreterBase):
                                                   )
             oi.process(self.option_file)
             self.build.environment.merge_options(oi.options)
-        if len(args) < 2:
-            raise InvalidArguments('Not enough arguments to project(). Needs at least the project name and one language')
         self.active_projectname = args[0]
         self.project_version = kwargs.get('version', 'undefined')
         if self.build.project_version is None:
@@ -1755,7 +1755,7 @@ class Interpreter(InterpreterBase):
     def add_languages(self, args, required):
         success = True
         need_cross_compiler = self.environment.is_cross_build() and self.environment.cross_info.need_cross_compiler()
-        for lang in args:
+        for lang in sorted(args, key=compilers.sort_clike):
             lang = lang.lower()
             if lang in self.coredata.compilers:
                 comp = self.coredata.compilers[lang]