From d73748815014b8b4bbbd7fe7fb8b50b8a75aecfc Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Tue, 19 Jun 2018 09:31:32 +0530 Subject: dependencies: Don't assume self.compiler is a C compiler All dependencies were using find_library, has_header, get_define, etc on self.compiler assuming that it's a compiler that outputs and consumes C-like libraries. This is not true for D (and in the future, for Rust) since although they can consume C libraries, they do not use the C ecosystem. For such purposes, we now have self.clib_compiler. Nothing uses self.compiler anymore as a result, and it has been removed. --- mesonbuild/compilers/compilers.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mesonbuild/compilers/compilers.py') diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 64d6d1c..2c48d07 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -48,9 +48,13 @@ lang_suffixes = { all_languages = lang_suffixes.keys() cpp_suffixes = lang_suffixes['cpp'] + ('h',) c_suffixes = lang_suffixes['c'] + ('h',) +# List of languages that by default consume and output libraries following the +# C ABI; these can generally be used interchangebly +clib_langs = ('objcpp', 'cpp', 'objc', 'c', 'fortran',) # List of languages that can be linked with C code directly by the linker # used in build.py:process_compilers() and build.py:get_dynamic_linker() -clike_langs = ('d', 'objcpp', 'cpp', 'objc', 'c', 'fortran', ) +# XXX: Add Rust to this? +clike_langs = ('d',) + clib_langs clike_suffixes = () for _l in clike_langs + ('vala',): clike_suffixes += lang_suffixes[_l] -- cgit v1.1