From 076786c1c7be7186ac2fa6eeea3608ae51ab96bb Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 18 Apr 2017 15:16:28 +0100 Subject: [PATCH] build: Use the common linker flags in GDK and GSK Instead of hard-coding `-Bsymbolic`. --- gdk/meson.build | 5 +++-- gsk/meson.build | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gdk/meson.build b/gdk/meson.build index a0606ef3a8..79d64f18b5 100644 --- a/gdk/meson.build +++ b/gdk/meson.build @@ -199,10 +199,11 @@ endforeach # FIXME: might have to add '-xobjective-c' to c_args for quartz backend? libgdk = static_library('gdk', sources: [gdk_sources, gdk_backends_gen_headers, gdkconfig], - c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"'] + common_cflags, + dependencies: gdk_deps, include_directories: [confinc, xinc, wlinc], + c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"'] + common_cflags, link_with: gdk_backends, - dependencies: gdk_deps) + link_args: common_ldflags) # We don't have link_with: to internal static libs here on purpose, just # list the dependencies and generated headers and such, for use in the diff --git a/gsk/meson.build b/gsk/meson.build index 3ebcda9e95..28420127dc 100644 --- a/gsk/meson.build +++ b/gsk/meson.build @@ -159,7 +159,7 @@ libgsk = static_library('gsk', include_directories: [confinc], c_args: ['-DGSK_COMPILATION', '-DG_LOG_DOMAIN="Gsk"'] + common_cflags, link_with: libgdk, - link_args: ['-Bsymbolic']) + link_args: common_ldflags) # We don't have link_with: to internal static libs here on purpose, just # list the dependencies and generated headers and such, for use in the