diff options
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 2 | ||||
| -rwxr-xr-x | run_unittests.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 38c96a9..968e1ee 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -173,7 +173,7 @@ class DependenciesHelper: for t in link_whole_targets: self._add_link_whole(t, public) # And finally its external dependencies - add_libs(external_deps) + self.add_priv_libs(external_deps) def _add_link_whole(self, t, public): # Don't include static libraries that we link_whole. But we still need to diff --git a/run_unittests.py b/run_unittests.py index 8f1c52a..03cd82b 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -6105,7 +6105,8 @@ class LinuxlikeTests(BasePlatformTests): # See common/47 pkgconfig-gen/meson.build for description of the case this test with open(os.path.join(privatedir1, 'simple2.pc')) as f: content = f.read() - self.assertIn('Libs: -L${libdir} -lsimple2 -lz -lsimple1', content) + self.assertIn('Libs: -L${libdir} -lsimple2 -lsimple1', content) + self.assertIn('Libs.private: -lz', content) with open(os.path.join(privatedir1, 'simple3.pc')) as f: content = f.read() |