diff options
| author | getzze <getzze@gmail.com> | 2017-10-10 23:18:19 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-10-19 20:22:32 +0300 |
| commit | 6ce42e2ec51a9f9b48b6d00303bf5dfc1596498e (patch) | |
| tree | 0b259670d48c5ee98753a8a0a768bdacafec8627 /mesonbuild/modules/pkgconfig.py | |
| parent | 3fcf4ad272e7901844e8b6465f866526c1d7e293 (diff) | |
| download | meson-6ce42e2ec51a9f9b48b6d00303bf5dfc1596498e.zip meson-6ce42e2ec51a9f9b48b6d00303bf5dfc1596498e.tar.gz meson-6ce42e2ec51a9f9b48b6d00303bf5dfc1596498e.tar.bz2 | |
Error for Libs in package_config function
Without specifying a custom install directory string, get_custom_install_dir() returns True. So for the `Libs` entry I was getting this:
Libs: -L${prefix}/True -lfoo
Now it behaves as expected:
Libs: -L${libdir} -lfoo
Diffstat (limited to 'mesonbuild/modules/pkgconfig.py')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index aaed820..8383a3a 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -80,9 +80,11 @@ class PkgConfigModule(ExtensionModule): yield l else: install_dir = l.get_custom_install_dir()[0] - if install_dir: + if install_dir is False: + continue + if isinstance(install_dir, str): yield '-L${prefix}/%s ' % install_dir - else: + else: # install_dir is True yield '-L${libdir}' lname = self._get_lname(l, msg, pcfile) # If using a custom suffix, the compiler may not be able to |