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

Try harder to use the C compiler for compiling asm

1 files changed, 16 insertions, 0 deletions

diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py
index f16a05f..5e7db24 100644
--- a/mesonbuild/compilers.py
+++ b/mesonbuild/compilers.py
@@ -57,6 +57,17 @@ clike_suffixes += ('h', 'll', 's')
 
 # All these are only for C-like languages; see `clike_langs` above.
 
+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 clike_langs:
+        return 1
+    return -clike_langs.index(lang)
+
 def is_header(fname):
     if hasattr(fname, 'fname'):
         fname = fname.fname
@@ -514,6 +525,11 @@ class Compiler:
         self.version = version
         self.base_options = []
 
+    def __repr__(self):
+        repr_str = "<{0}: v{1} `{2}`>"
+        return repr_str.format(self.__class__.__name__, self.version,
+                               ' '.join(self.exelist))
+
     def can_compile(self, src):
         if hasattr(src, 'fname'):
             src = src.fname