Meson: Do not build tests with nodelete/Bsymbolic-functions

-z nodelete breaks the libresourceplugin module usage in the resources.c
test, which expects to be able to unload it.

Make the Meson build match what the autotools build does: only pass
glib_link_flags to the headline libraries (glib-2.0, gio-2.0,
gobject-2.0, gthread-2.0, gmodule-2.0) and omit it from all other build
targets.

https://bugzilla.gnome.org/show_bug.cgi?id=788771
This commit is contained in:
Xavier Claessens
2018-05-01 09:44:19 -04:00
committed by Philip Withnall
parent e924f77736
commit b6cb22f32b
6 changed files with 19 additions and 7 deletions

View File

@@ -793,14 +793,13 @@ libgio = library('gio-2.0',
install : true,
include_directories : [configinc, gioinc],
link_with : internal_deps,
#libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS)',
# '$(gio_win32_res_ldflag)',
dependencies : [libintl, libz_dep, libdl_dep, libmount_dep, libglib_dep,
libgobject_dep, libgmodule_dep, selinux_dep, xattr_dep,
platform_deps, network_libs],
c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
link_args : [noseh_link_args, glib_link_flags],
)
giomodulesdir = get_option('gio_module_dir')