diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-01-10 10:29:11 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-01-10 12:31:44 +0100 |
| commit | 349861ceec4085fd1f0ff0af8bcf873aa15ba611 (patch) | |
| tree | 6543ad02add282e0c3c0a62d632d607f93659eaa /libnm-glib | |
| parent | ec016f6b43f4f7727944d67e358e7dc01ee2e42d (diff) | |
build/meson: unconditionally use linker version scripts
We also unconditionally use them with autotools.
Also, the detection for have_version_script does
not seem correct to me. At least, it didn't work
with clang.
Diffstat (limited to 'libnm-glib')
| -rw-r--r-- | libnm-glib/meson.build | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build index b4e3f0dcb..9ec79ca72 100644 --- a/libnm-glib/meson.build +++ b/libnm-glib/meson.build @@ -102,10 +102,9 @@ deps = common_deps + [libnm_util_dep] symbol_map = join_paths(meson.current_source_dir(), 'libnm-glib-vpn.ver') -ldflags = [] -if have_version_script - ldflags += '-Wl,--version-script,@0@'.format(symbol_map) -endif +ldflags = [ + '-Wl,--version-script,@0@'.format(symbol_map), +] libnm_glib_vpn = shared_library( 'nm-glib-vpn', @@ -195,10 +194,9 @@ deps = common_deps + [ symbol_map = join_paths(meson.current_source_dir(), 'libnm-glib.ver') -ldflags = [] -if have_version_script - ldflags += '-Wl,--version-script,@0@'.format(symbol_map) -endif +ldflags = [ + '-Wl,--version-script,@0@'.format(symbol_map), +] libnm_glib = shared_library( 'nm-glib', |