aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek.chauhan@gmail.com>2018-07-08 10:58:07 -0700
committerGitHub <noreply@github.com>2018-07-08 10:58:07 -0700
commit78f1ef85fd6bf663b7a7d9d06f731f7ce9a6f629 (patch)
treedc375d803560ab20f86da49a6c8bbd89fd1ac7b5 /mesonbuild
parent2428b388db6eab8d450b1daee20c4cdb0bb88a65 (diff)
downloadmeson-78f1ef85fd6bf663b7a7d9d06f731f7ce9a6f629.zip
meson-78f1ef85fd6bf663b7a7d9d06f731f7ce9a6f629.tar.gz
meson-78f1ef85fd6bf663b7a7d9d06f731f7ce9a6f629.tar.bz2
Add missing method on external library object: type_name() (#3845)
For some reason this was missing, but it should've always existed since cc.find_library() returns an object that is internally an ExternalDependency instance.
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/dependencies/base.py2
-rw-r--r--mesonbuild/interpreter.py6
2 files changed, 7 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index 63b817a..0fe702f 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -995,7 +995,7 @@ class NonExistingExternalProgram(ExternalProgram):
class ExternalLibrary(ExternalDependency):
def __init__(self, name, link_args, environment, language, silent=False):
- super().__init__('external', environment, language, {})
+ super().__init__('library', environment, language, {})
self.name = name
self.language = language
self.is_found = False
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 833e982..2c54eae 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -483,6 +483,7 @@ class ExternalLibraryHolder(InterpreterObject, ObjectHolder):
InterpreterObject.__init__(self)
ObjectHolder.__init__(self, el, pv)
self.methods.update({'found': self.found_method,
+ 'type_name': self.type_name_method,
'partial_dependency': self.partial_dependency_method,
})
@@ -491,6 +492,11 @@ class ExternalLibraryHolder(InterpreterObject, ObjectHolder):
@noPosargs
@permittedKwargs({})
+ def type_name_method(self, args, kwargs):
+ return self.held_object.type_name
+
+ @noPosargs
+ @permittedKwargs({})
def found_method(self, args, kwargs):
return self.found()