summaryrefslogtreecommitdiff
path: root/gthread
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2018-05-01 09:44:19 -0400
committerPhilip Withnall <withnall@endlessm.com>2018-05-09 12:52:59 +0100
commitb6cb22f32bf3df3c21310bd10b9c122ca4b8e3f6 (patch)
treeedeac27df5feec0395236b48befd1f15eb743775 /gthread
parente924f777369710221c3e0a9d7bf40392a27d1fa4 (diff)
downloadglib-b6cb22f32bf3df3c21310bd10b9c122ca4b8e3f6.tar.gz
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
Diffstat (limited to 'gthread')
-rw-r--r--gthread/meson.build4
1 files changed, 3 insertions, 1 deletions
diff --git a/gthread/meson.build b/gthread/meson.build
index 3787dba3b..6b0748f15 100644
--- a/gthread/meson.build
+++ b/gthread/meson.build
@@ -18,7 +18,9 @@ libgthread = library('gthread-2.0',
soversion : soversion,
install : true,
dependencies : [libglib_dep],
- c_args : ['-DG_LOG_DOMAIN="GThread"' ] + glib_hidden_visibility_args)
+ c_args : ['-DG_LOG_DOMAIN="GThread"' ] + glib_hidden_visibility_args,
+ link_args : glib_link_flags,
+)
pkg.generate(libraries : [libgthread, thread_dep],
requires : ['glib-2.0'],