From 2a7f31b6fb5669e5d41dcbf8ef3d8f3e982932ea Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sat, 11 Aug 2018 23:13:36 +0100 Subject: Use the correct Meson argument for linking Some of the internal static libraries in dconf implement public symbols. This means that they must be linked using `link_whole`, to prevent the linker from hiding unused symbols in there when building the shared libdconf.so. This fixes the build of projects using the dconf API directly, like dconf-editor, in GNOME Continuous. Reviewed-by: nobody Signed-off-by: Emmanuele Bassi --- client/meson.build | 2 +- common/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/meson.build b/client/meson.build index 9153b06..305737b 100644 --- a/client/meson.build +++ b/client/meson.build @@ -25,7 +25,7 @@ libdconf_client = static_library( libdconf_client_dep = declare_dependency( dependencies: gio_dep, - link_with: libdconf_client, + link_whole: libdconf_client, ) libdconf = shared_library( diff --git a/common/meson.build b/common/meson.build index 6cf38b5..90245b7 100644 --- a/common/meson.build +++ b/common/meson.build @@ -30,7 +30,7 @@ libdconf_common = static_library( libdconf_common_dep = declare_dependency( dependencies: glib_dep, - link_with: libdconf_common, + link_whole: libdconf_common, ) cflags += cc.get_supported_arguments('-fvisibility=hidden') -- cgit v1.2.1