summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2018-08-11 23:13:36 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2018-08-11 23:16:08 +0100
commit2a7f31b6fb5669e5d41dcbf8ef3d8f3e982932ea (patch)
tree70920e7e19aa49bbca10c28ccef076afb9cddb14
parent20223ed7dab543caeb075ec9f2b7cfbda5e0bec0 (diff)
downloaddconf-2a7f31b6fb5669e5d41dcbf8ef3d8f3e982932ea.tar.gz
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 <ebassi@gnome.org>
-rw-r--r--client/meson.build2
-rw-r--r--common/meson.build2
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')