[gtk+/wip/meson: 165/181] build: Use the common linker flags in GDK and GSK



commit ee5240c13b7fcb6c29add3fd4e40f0454ec472f2
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Apr 18 15:16:28 2017 +0100

    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 a0606ef..79d64f1 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 3ebcda9..2842012 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]