diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-21 16:05:24 +0530 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2017-04-21 10:15:18 -0700 |
| commit | 723884a369efa6fb5b825d76c4f81ba124358e2d (patch) | |
| tree | bdce88809e17e715e1563f57dff4e340b57dd736 /mesonbuild/interpreter.py | |
| parent | af9d1f8f15a57a99af376bd6b30730ff9b9812b1 (diff) | |
| download | meson-723884a369efa6fb5b825d76c4f81ba124358e2d.zip meson-723884a369efa6fb5b825d76c4f81ba124358e2d.tar.gz meson-723884a369efa6fb5b825d76c4f81ba124358e2d.tar.bz2 | |
Expose the implementation language for external libraries
Ideally, all dependency objects should support this, but it's a lot of
work and isn't supported by all dependency types (like frameworks and
pkg-config), so for now just enable it for external libraries.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index ed08987..0eb392d 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -982,14 +982,7 @@ class CompilerHolder(InterpreterObject): if required and not linkargs: l = self.compiler.language.capitalize() raise InterpreterException('{} library {!r} not found'.format(l, libname)) - # If this is set to None, the library and link arguments are for - # a C-like compiler. Otherwise, it's for some other language that has - # a find_library implementation. We do this because it's easier than - # maintaining a list of languages that can consume C libraries. - lang = None - if self.compiler.language == 'vala': - lang = 'vala' - lib = dependencies.ExternalLibrary(libname, linkargs, language=lang) + lib = dependencies.ExternalLibrary(libname, linkargs, self.compiler.language) return ExternalLibraryHolder(lib) def has_argument_method(self, args, kwargs): |