Try harder to use the C compiler for compiling asm

Use an ordered dict for the compiler dictionary and sort it according
to a priority order: fortran, c, c++, etc.

This also ensures that builds are reproducible because it would be
a toss-up whether a C or a C++ compiler would be used based on the
order in which compilers.items() would return items.

Closes https://github.com/mesonbuild/meson/issues/1370

1 files changed, 13 insertions, 1 deletions

diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 5d3c095..56e5b8f 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1752,10 +1752,22 @@ class Interpreter(InterpreterBase):
         self.coredata.compiler_options = new_options
         return comp, cross_comp
 
+    @staticmethod
+    def sort_clike(lang):
+        '''
+        Sorting function to sort the list of languages according to
+        reversed(compilers.clike_langs) and append the unknown langs in the end.
+        The purpose is to prefer C over C++ for files that can be compiled by
+        both such as assembly, C, etc. Also applies to ObjC, ObjC++, etc.
+        '''
+        if lang not in compilers.clike_langs:
+            return 1
+        return -compilers.clike_langs.index(lang)
+
     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=self.sort_clike):
             lang = lang.lower()
             if lang in self.coredata.compilers:
                 comp = self.coredata.compilers[lang]