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.

20 files changed, 64 insertions, 90 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,
diff --git a/dispatcher/meson.build b/dispatcher/meson.build
index c72175bdb7..c6b94a39ed 100644
--- a/dispatcher/meson.build
+++ b/dispatcher/meson.build
@@ -54,10 +54,9 @@ sources += gnome.gdbus_codegen(
   namespace: 'NMDBus'
 )
 
-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/libnm-glib/meson.build b/libnm-glib/meson.build
index b4e3f0dcb7..9ec79ca72f 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',
diff --git a/libnm-util/meson.build b/libnm-util/meson.build
index db2bb44f39..3cd53d9e74 100644
--- a/libnm-util/meson.build
+++ b/libnm-util/meson.build
@@ -110,10 +110,9 @@ cflags = common_cflags + [
 
 symbol_map = join_paths(meson.current_source_dir(), 'libnm-util.ver')
 
-ldflags = []
-if have_version_script
-  ldflags += '-Wl,--version-script,@0@'.format(symbol_map)
-endif
+ldflags = [
+  '-Wl,--version-script,@0@'.format(symbol_map),
+]
 
 libnm_util = shared_library(
   'nm-util',
diff --git a/libnm/meson.build b/libnm/meson.build
index d40ef91173..949908191c 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -145,10 +145,9 @@ deps = [
 
 symbol_map = join_paths(meson.current_source_dir(), 'libnm.ver')
 
-ldflags = []
-if have_version_script
-  ldflags += '-Wl,--version-script,@0@'.format(symbol_map)
-endif
+ldflags = [
+  '-Wl,--version-script,@0@'.format(symbol_map),
+]
 
 libnm = shared_library(
   'nm',
diff --git a/meson.build b/meson.build
index 8fb9d92ff3..5a565e5a5c 100644
--- a/meson.build
+++ b/meson.build
@@ -165,9 +165,6 @@ endif
 add_project_arguments(common_flags, language: 'c')
 add_project_link_arguments(common_ldflags, language: 'c')
 
-ldflag = '-Wl,--version-script'
-have_version_script = host_machine.system().contains('linux') and cc.has_argument(ldflag)
-
 linker_script_binary = join_paths(meson.source_root(), 'linker-script-binary.ver')
 linker_script_devices = join_paths(meson.source_root(), 'linker-script-devices.ver')
 linker_script_settings = join_paths(meson.source_root(), 'linker-script-settings.ver')
diff --git a/src/devices/adsl/meson.build b/src/devices/adsl/meson.build
index bca488e50f..227f67f62c 100644
--- a/src/devices/adsl/meson.build
+++ b/src/devices/adsl/meson.build
@@ -9,10 +9,9 @@ deps = [
   nm_dep
 ]
 
-ldflags = []
-if have_version_script
-  ldflags += '-Wl,--version-script,@0@'.format(linker_script_devices)
-endif
+ldflags = [
+  '-Wl,--version-script,@0@'.format(linker_script_devices),
+]
 
 libnm_device_plugin_adsl = shared_module(
   'nm-device-plugin-adsl',
diff --git a/src/devices/bluetooth/meson.build b/src/devices/bluetooth/meson.build
index e1ce74b316..85d29c7621 100644
--- a/src/devices/bluetooth/meson.build
+++ b/src/devices/bluetooth/meson.build
@@ -14,10 +14,9 @@ deps = [
   nm_dep
 ]
 
-ldflags = []
-if have_version_script
-  ldflags += '-Wl,--version-script,@0@'.format(linker_script_devices)
-endif
+ldflags = [
+  '-Wl,--version-script,@0@'.format(linker_script_devices),
+]
 
 if enable_bluez5_dun
   sources += files('nm-bluez5-dun.c')
diff --git a/src/devices/ovs/meson.build b/src/devices/ovs/meson.build
index 64d98dfe33..c867e17b5a 100644
--- a/src/devices/ovs/meson.build
+++ b/src/devices/ovs/meson.build
@@ -12,10 +12,9 @@ deps = [
   nm_dep
 ]
 
-ldflags = []
-if have_version_script
-  ldflags += '-Wl,--version-script,@0@'.format(linker_script_devices)
-endif
+ldflags = [
+  '-Wl,--version-script,@0@'.format(linker_script_devices),
+]
 
 libnm_device_plugin_ovs = shared_module(
   'nm-device-plugin-ovs',
diff --git a/src/devices/team/meson.build b/src/devices/team/meson.build
index 0853c610d0..84782890e8 100644
--- a/src/devices/team/meson.build
+++ b/src/devices/team/meson.build
@@ -10,10 +10,9 @@ deps = [
   nm_dep
 ]
 
-ldflags = []
-if have_version_script
-  ldflags += '-Wl,--version-script,@0@'.format(linker_script_devices)
-endif
+ldflags = [
+  '-Wl,--version-script,@0@'.format(linker_script_devices),
+]
 
 libnm_device_plugin_team = shared_module(
   'nm-device-plugin-team',
diff --git a/src/devices/wifi/meson.build b/src/devices/wifi/meson.build
index a733b379c8..a6801f055e 100644
--- a/src/devices/wifi/meson.build
+++ b/src/devices/wifi/meson.build
@@ -21,10 +21,9 @@ deps = [
   nm_dep
 ]
 
-ldflags = []
-if have_version_script
-  ldflags += '-Wl,--version-script,@0@'.format(linker_script_devices)
-endif
+ldflags = [
+  '-Wl,--version-script,@0@'.format(linker_script_devices),
+]
 
 libnm_device_plugin_wifi = shared_module(
   'nm-device-plugin-wifi',
diff --git a/src/devices/wwan/meson.build b/src/devices/wwan/meson.build
index e571cf94f8..70f6977775 100644
--- a/src/devices/wwan/meson.build
+++ b/src/devices/wwan/meson.build
@@ -16,10 +16,9 @@ endif
 
 symbol_name = join_paths(meson.current_source_dir(), 'libnm-wwan.ver')
 
-ldflags = []
-if have_version_script
-  ldflags += '-Wl,--version-script,@0@'.format(symbol_name)
-endif
+ldflags = [
+  '-Wl,--version-script,@0@'.format(symbol_name),
+]
 
 libnm_wwan = shared_module(
   'nm-wwan',
@@ -51,10 +50,9 @@ sources = files(
 
 deps += libnmdbus_dep
 
-ldflags = []
-if have_version_script
-  ldflags += '-Wl,--version-script,@0@'.format(linker_script_devices)
-endif
+ldflags = [
+  '-Wl,--version-script,@0@'.format(linker_script_devices),
+]
 
 libnm_device_plugin_wwan = shared_module(
   'nm-device-plugin-wwan',
diff --git a/src/dhcp/meson.build b/src/dhcp/meson.build
index a41aac46a1..a08ca7653d 100644
--- a/src/dhcp/meson.build
+++ b/src/dhcp/meson.build
@@ -6,10 +6,9 @@ cflags = [
   '-DNMRUNDIR="@0@"'.format(nm_pkgrundir),
 ]
 
-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/src/meson.build b/src/meson.build
index df197bd28f..b3d7f333e0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -232,9 +232,7 @@ symbol_map = custom_target(
   command: [create_exports_networkmanager, '--called-from-make', '@INPUT@']
 )
 
-if have_version_script
-  ldflags += '-Wl,--version-script,@0@'.format(symbol_map)
-endif
+ldflags += '-Wl,--version-script,@0@'.format(symbol_map)
 '''
 
 network_manager = executable(
@@ -257,10 +255,9 @@ deps = [
   nm_core_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),
+]
 
 name = 'nm-iface-helper'
 
diff --git a/src/ppp/meson.build b/src/ppp/meson.build
index fc6a319670..4c512e7604 100644
--- a/src/ppp/meson.build
+++ b/src/ppp/meson.build
@@ -28,10 +28,9 @@ deps = [
 
 symbol_map = join_paths(meson.current_source_dir(), 'nm-ppp-plugin.ver')
 
-ldflags = []
-if have_version_script
-  ldflags += '-Wl,--version-script,@0@'.format(symbol_map)
-endif
+ldflags = [
+  '-Wl,--version-script,@0@'.format(symbol_map),
+]
 
 core_plugins += shared_module(
   name,
diff --git a/src/settings/plugins/ibft/meson.build b/src/settings/plugins/ibft/meson.build
index 12f0acba6d..ace2f72a5c 100644
--- a/src/settings/plugins/ibft/meson.build
+++ b/src/settings/plugins/ibft/meson.build
@@ -17,10 +17,9 @@ sources = files(
   'nms-ibft-plugin.c'
 )
 
-ldflags = []
-if have_version_script
-  ldflags += '-Wl,--version-script,@0@'.format(linker_script_settings)
-endif
+ldflags = [
+  '-Wl,--version-script,@0@'.format(linker_script_settings),
+]
 
 libnm_settings_plugin_ibft = shared_module(
   name,
diff --git a/src/settings/plugins/ifcfg-rh/meson.build b/src/settings/plugins/ifcfg-rh/meson.build
index 2d46fc45d0..eab51c0c0e 100644
--- a/src/settings/plugins/ifcfg-rh/meson.build
+++ b/src/settings/plugins/ifcfg-rh/meson.build
@@ -46,10 +46,9 @@ libnms_ifcfg_rh_core = static_library(
 
 sources = [dbus_sources] + files('nms-ifcfg-rh-connection.c')
 
-ldflags = []
-if have_version_script
-  ldflags += '-Wl,--version-script,@0@'.format(linker_script_settings)
-endif
+ldflags = [
+  '-Wl,--version-script,@0@'.format(linker_script_settings),
+]
 
 libnm_settings_plugin_ifcfg_rh = shared_module(
   'nm-settings-plugin-ifcfg-rh',
diff --git a/src/settings/plugins/ifupdown/meson.build b/src/settings/plugins/ifupdown/meson.build
index 9800f58887..1dc875a645 100644
--- a/src/settings/plugins/ifupdown/meson.build
+++ b/src/settings/plugins/ifupdown/meson.build
@@ -22,10 +22,9 @@ sources = files(
   'nms-ifupdown-plugin.c'
 )
 
-ldflags = []
-if have_version_script
-  ldflags += '-Wl,--version-script,@0@'.format(linker_script_settings)
-endif
+ldflags = [
+  '-Wl,--version-script,@0@'.format(linker_script_settings),
+]
 
 libnm_settings_plugin_ifupdown = shared_module(
   'nm-settings-plugin-ifupdown',