diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2025-02-16 09:43:50 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2025-02-16 09:43:50 +0000 |
| commit | a83fa4c7582e537980f0bed750890d9618230967 (patch) | |
| tree | 94328052d0b0c233af24e9b408946f5b330487f4 | |
| parent | 3aba012907471f886077a1a288f803bcd5a6e895 (diff) | |
| parent | 2a4a61443e6b1fb0bb9c96c5dbe474699f9b3430 (diff) | |
| download | slirp-a83fa4c7582e537980f0bed750890d9618230967.zip slirp-a83fa4c7582e537980f0bed750890d9618230967.tar.gz slirp-a83fa4c7582e537980f0bed750890d9618230967.tar.bz2 | |
Merge branch 'master' into 'master'
Do not link tests with libslirp.map
Closes #84
See merge request slirp/libslirp!151
| -rw-r--r-- | meson.build | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meson.build b/meson.build index f275374..39e80ed 100644 --- a/meson.build +++ b/meson.build @@ -168,9 +168,9 @@ sources = [ mapfile = 'src/libslirp.map' vflag = [] -vflag_test = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile) +libvflag = [] if cc.has_link_argument('-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), 'src/libslirp.test.map')) - vflag += vflag_test + libvflag += '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile) endif if fuzzer_build @@ -203,7 +203,7 @@ configure_file( if glib_static or fuzzer_build or fuzz_reproduce lib = static_library('slirp', sources, c_args : cargs, - link_args : vflag, + link_args : libvflag + vflag, link_depends : mapfile, dependencies : libslirp_deps, ) @@ -211,7 +211,7 @@ else lib = library('slirp', sources, version : lt_version, c_args : cargs, - link_args : vflag, + link_args : libvflag + vflag, link_depends : mapfile, dependencies : libslirp_deps, install : install_devel or get_option('default_library') == 'shared', |