shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-26 14:04:03 +03:00
Code

meson: link test-lib{systemd,udev}-sym in the usual way

Browse Source 
I tried to link to the right library by hand, because without
mesonbuid/meson#1545, libbasic.a is added to the link arguments. We want to
link the test with nothing but the library being tested. Doing the linking by
hand did achieve that, but it caused a bigger issue: meson didn't know about
the dependency on the library. And the dependency cannot be added using
link_depends, because "link_depends arguments must be strings...", and this
does not work with a compilation target. So just link in the usual way and
accept the overlinking (for now).
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-04-10 17:35:55 -04:00
parent 09cef4e7cc
commit ef0221bc95
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -2000,11 +2000,7 @@ test_libsystemd_sym = executable(
'test-libsystemd-sym',
test_libsystemd_sym_c,
include_directories : includes,
# link_with : [libsystemd],
# TODO: try again with https://github.com/mesonbuild/meson/pull/1545
link_args : ['libsystemd.so.0.18.0'],
# link_depends : [libsystemd],
# TODO: try again after "Link_depends arguments must be strings." is solved
link_with : [libsystemd],
install : install_tests,
install_dir : testsdir)
test('test-libsystemd-sym',
@ -2015,7 +2011,7 @@ test_libudev_sym = executable(
test_libudev_sym_c,
include_directories : includes,
c_args : ['-Wno-deprecated-declarations'],
link_args : ['src/libudev/libudev.so.1.6.6'],
link_with : [libudev],
install : install_tests,
install_dir : testsdir)
test('test-libudev-sym',