aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2016-12-19 03:00:17 -0500
committerJussi Pakkanen <jpakkane@gmail.com>2016-12-21 00:10:39 +0200
commitc7f788e1846082a870dde58d15b355f9aa2cb4a7 (patch)
treedf93370ddea4a94ec4f32955decfcc07ec9ddb99
parenta2528a881640913dfc71fab7f15225d7e7d9a567 (diff)
downloadmeson-c7f788e1846082a870dde58d15b355f9aa2cb4a7.zip
meson-c7f788e1846082a870dde58d15b355f9aa2cb4a7.tar.gz
meson-c7f788e1846082a870dde58d15b355f9aa2cb4a7.tar.bz2
Fix exception when linking with invalid object.
If you declare_dependency(link_with : 'string'), an exception is supposed to be raised, but instead of a proper message, it's an exception about a missing attribute.
-rw-r--r--mesonbuild/build.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index cc8f179..afd8b0a 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -748,7 +748,7 @@ class BuildTarget():
if hasattr(t, 'held_object'):
t = t.held_object
if not isinstance(t, (StaticLibrary, SharedLibrary)):
- raise InvalidArguments('Link target {!r} is not library.'.format(t.name))
+ raise InvalidArguments('Link target {!r} is not library.'.format(t))
if isinstance(self, SharedLibrary) and isinstance(t, StaticLibrary) and not t.pic:
msg = "Can't link non-PIC static library {!r} into shared library {!r}. ".format(t.name, self.name)
msg += "Use the 'pic' option to static_library to build with PIC."