diff --git a/meson.build b/meson.build index 9a063a160d5aec2373de425ed0f2d0e85d84ba0a..63c26877121b31422563f98f3fac9a7e22bae684 100644 --- a/meson.build +++ b/meson.build @@ -107,9 +107,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_ver = join_paths(meson.source_root(), 'linker-script-binary.ver') # Check for iso-codes for country names translation diff --git a/src/connection-editor/meson.build b/src/connection-editor/meson.build index 8ab39a91f16bcb79077c712db217d6131103c499..9f354ce150a0b25dc2f2d79bc1154c1ce2fb85ef 100644 --- a/src/connection-editor/meson.build +++ b/src/connection-editor/meson.build @@ -98,11 +98,6 @@ cflags = [ '-DICONDIR="@0@"'.format(nma_icondir) ] -ldflags = [] -if have_version_script - ldflags += '-Wl,--version-script,@0@'.format(linker_script_ver) -endif - if enable_selinux deps += libselinux_dep endif @@ -117,7 +112,7 @@ executable( include_directories: incs, dependencies: deps, c_args: cflags, - link_args: ldflags, + link_args: '-Wl,--version-script,@0@'.format(linker_script_ver), link_depends: linker_script_ver, link_whole: libwireless_security_libnm, install: true, diff --git a/src/libnm-gtk/meson.build b/src/libnm-gtk/meson.build index 569ee8121ac91860ff3db63480abbbfbdf23cbe5..96c3c8bd924462fabae1ffd7e90a6d96024402bd 100644 --- a/src/libnm-gtk/meson.build +++ b/src/libnm-gtk/meson.build @@ -63,11 +63,6 @@ cflags = [ symbol_map = join_paths(meson.current_source_dir(), 'libnm-gtk.ver') -ldflags = [] -if have_version_script - ldflags += '-Wl,--version-script,' + symbol_map -endif - libnm_gtk = shared_library( 'nm-gtk', sources: sources, @@ -75,7 +70,7 @@ libnm_gtk = shared_library( include_directories: incs, dependencies: deps, c_args: cflags, - link_args: ldflags, + link_args: '-Wl,--version-script,' + symbol_map, link_depends: symbol_map, link_whole: libwireless_security_libnm_glib, install: true, diff --git a/src/libnma/meson.build b/src/libnma/meson.build index 9344bde11e32061c95488d272be8ab36d0411ef3..879e1b84652fffc66dd6395ec99d32f961138fd8 100644 --- a/src/libnma/meson.build +++ b/src/libnma/meson.build @@ -71,11 +71,6 @@ cflags = [ symbol_map = join_paths(meson.current_source_dir(), 'libnma.ver') -ldflags = [] -if have_version_script - ldflags += '-Wl,--version-script,' + symbol_map -endif - if enable_gcr headers += files( 'nma-cert-chooser-button.h', @@ -100,7 +95,7 @@ libnma = shared_library( include_directories: incs, dependencies: deps, c_args: cflags, - link_args: ldflags, + link_args: '-Wl,--version-script,' + symbol_map, link_depends: symbol_map, link_whole: libwireless_security_libnm, install: true, diff --git a/src/meson.build b/src/meson.build index c96f9d0a4cccc9c594642cc120f3715bc3535c58..cd5c9368c9e51b9210272094dcfa7fe77a1624a6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -88,11 +88,6 @@ cflags = [ '-DG_LOG_DOMAIN="@0@"'.format(nma_name) ] -ldflags = [] -if have_version_script - ldflags += '-Wl,--version-script,@0@'.format(linker_script_ver) -endif - if enable_appindicator == 'ayatana' or enable_appindicator == 'ubuntu' deps += [ appindicator_dep, @@ -112,7 +107,7 @@ executable( include_directories: incs, dependencies: deps, c_args: cflags, - link_args: ldflags, + link_args: '-Wl,--version-script,@0@'.format(linker_script_ver), link_depends: linker_script_ver, link_whole: libwireless_security_libnm, install: true,