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 /clients | |
| parent | ec016f6b43f4f7727944d67e358e7dc01ee2e42d (diff) | |
| download | NetworkManager-349861ceec4085fd1f0ff0af8bcf873aa15ba611.tar.gz | |
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 'clients')
| -rw-r--r-- | clients/cli/meson.build | 7 | ||||
| -rw-r--r-- | clients/meson.build | 7 | ||||
| -rw-r--r-- | clients/tui/meson.build | 7 |
3 files changed, 9 insertions, 12 deletions
diff --git a/clients/cli/meson.build b/clients/cli/meson.build index 5b50018934..adfe0e94a9 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -31,10 +31,9 @@ cflags = clients_cflags + [ '-DNMCLI_LOCALEDIR="@0@"'.format(nm_localedir) ] -ldflags = [] -if have_version_script - ldflags += '-Wl,--version-script,@0@'.format(linker_script_binary) -endif +ldflags = [ + '-Wl,--version-script,@0@'.format(linker_script_binary), +] if enable_polkit_agent sources += nm_polkit_listener diff --git a/clients/meson.build b/clients/meson.build index f5e9c0eab2..efcaf299fb 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -14,10 +14,9 @@ cflags = clients_cflags + [ '-DG_LOG_DOMAIN="@0@"'.format(name), ] -ldflags = [] -if have_version_script - ldflags += '-Wl,--version-script,@0@'.format(linker_script_binary) -endif +ldflags = [ + '-Wl,--version-script,@0@'.format(linker_script_binary), +] executable( name, diff --git a/clients/tui/meson.build b/clients/tui/meson.build index 37428655a6..d2bf27c687 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -61,10 +61,9 @@ deps += [ libnmt_newt_dep ] -ldflags = [] -if have_version_script - ldflags += '-Wl,--version-script,@0@'.format(linker_script_binary) -endif +ldflags = [ + '-Wl,--version-script,@0@'.format(linker_script_binary), +] executable( name, |