From 7975bbfcaa0e1276f02a57e66fe394efc3c56e49 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue, 15 Dec 2020 11:36:20 +0000
Subject: [PATCH] build: Remove linker flags from static libraries

We only need hardening linker flags on the libgtk shared library;
internal static libraries don't really need them.
---
 gdk/broadway/meson.build       | 1 -
 gdk/macos/meson.build          | 1 -
 gdk/meson.build                | 2 +-
 gdk/wayland/cursor/meson.build | 3 +--
 gdk/wayland/meson.build        | 1 -
 gdk/x11/meson.build            | 1 -
 gsk/meson.build                | 3 +--
 gtk/css/meson.build            | 3 +--
 8 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build
index bf3cdc036d..87176f3c69 100644
--- a/gdk/broadway/meson.build
+++ b/gdk/broadway/meson.build
@@ -59,7 +59,6 @@ libgdk_broadway = static_library('gdk-broadway',
     '-DGTK_COMPILATION',
     '-DG_LOG_DOMAIN="Gdk"',
   ] + common_cflags,
-  link_args: common_ldflags,
   dependencies: [gdk_deps, gdk_broadway_deps])
 
 # gtk4-broadwayd
diff --git a/gdk/macos/meson.build b/gdk/macos/meson.build
index e2bba8549b..79a307d253 100644
--- a/gdk/macos/meson.build
+++ b/gdk/macos/meson.build
@@ -58,6 +58,5 @@ libgdk_macos = static_library('gdk-macos',
                               gdk_macos_sources, gdkconfig, gdkenum_h,
                               include_directories: [ confinc, gdkinc, ],
                               c_args: libgdk_c_args + common_cflags,
-                              link_args: common_ldflags,
                               link_with: [],
                               dependencies: gdk_deps + gdk_macos_deps)
diff --git a/gdk/meson.build b/gdk/meson.build
index fb8956c1df..b131bcc8e6 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -251,7 +251,7 @@ libgdk = static_library('gdk',
   include_directories: [confinc, gdkx11_inc, wlinc],
   c_args: libgdk_c_args + common_cflags,
   link_whole: gdk_backends,
-  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/gdk/wayland/cursor/meson.build b/gdk/wayland/cursor/meson.build
index 4b48085d12..0043d7c858 100644
--- a/gdk/wayland/cursor/meson.build
+++ b/gdk/wayland/cursor/meson.build
@@ -8,5 +8,4 @@ libwayland_cursor = static_library('wayland+cursor',
                                    sources: wayland_cursor_sources,
                                    include_directories: [ confinc, ],
                                    dependencies: [ glib_dep, wlclientdep, ],
-                                   c_args: common_cflags,
-                                   link_args: common_ldflags)
+                                   c_args: common_cflags)
diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build
index 4d5f3ea5cc..6cc75c8754 100644
--- a/gdk/wayland/meson.build
+++ b/gdk/wayland/meson.build
@@ -102,6 +102,5 @@ libgdk_wayland = static_library('gdk-wayland',
                                   '-DGTK_COMPILATION',
                                   '-DG_LOG_DOMAIN="Gdk"',
                                 ] + common_cflags,
-                                link_args: common_ldflags,
                                 link_with: [libwayland_cursor, ],
                                 dependencies: [ gdk_deps, gdk_wayland_deps])
diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
index f846450c3b..46eec9da45 100644
--- a/gdk/x11/meson.build
+++ b/gdk/x11/meson.build
@@ -79,5 +79,4 @@ libgdk_x11 = static_library('gdk-x11', gdkmarshal_h,
                               '-DGTK_COMPILATION',
                               '-DG_LOG_DOMAIN="Gdk"',
                             ] + common_cflags,
-                            link_args: common_ldflags,
                             dependencies: [ gdk_deps, gdk_x11_deps, ])
diff --git a/gsk/meson.build b/gsk/meson.build
index ffec4d2ce4..8c8e79d9b9 100644
--- a/gsk/meson.build
+++ b/gsk/meson.build
@@ -175,8 +175,7 @@ libgsk = static_library('gsk',
                           '-DG_LOG_DOMAIN="Gsk"',
                           '-DG_LOG_STRUCTURED=1',
                         ] + common_cflags,
-                        link_with: libgdk,
-                        link_args: common_ldflags)
+                        link_with: libgdk)
 
 # 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/gtk/css/meson.build b/gtk/css/meson.build
index 501411f917..0b5ddd948e 100644
--- a/gtk/css/meson.build
+++ b/gtk/css/meson.build
@@ -47,8 +47,7 @@ libgtk_css = static_library('gtk_css',
                             c_args: [
                               '-DGTK_COMPILATION',
                               '-DG_LOG_DOMAIN="Gtk"',
-                            ] + common_cflags,
-                            link_args: common_ldflags)
+                            ] + common_cflags)
 
 # 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