[cairo-commit] 2 commits - meson.build

[GitLab Mirror]

 meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b5d2395a5fd9f357839df8c5e6d4dae1ac302e13
Merge: 20a3767c4 c3fc77294
Author: Emmanuele Bassi <ebassi at gmail.com>
Date:   Fri Jun 10 14:55:03 2022 +0000

    Merge branch 'link-to-the-ssp-static-library-when-fortify-source-is-enabled' into 'master'
    
    Link to -lssp when enabling _FORTIFY_SOURCE
    
    See merge request cairo/cairo!331

commit c3fc7729484a55ac86c023751ff55502338175d2
Author: Luca Bacci <luca.bacci982 at gmail.com>
Date:   Tue Jun 7 19:03:30 2022 +0200

    Meson: link to -lssp when enabling _FORTIFY_SOURCE
    
    This is required for MinGW GCC

diff --git a/meson.build b/meson.build
index aa6506332..35ae65b59 100644
--- a/meson.build
+++ b/meson.build
@@ -69,7 +69,7 @@ if cc.get_id() != 'msvc'
   ]
 
   if get_option('optimization') in ['1', '2', '3']
-    cflags += '-Wp,-D_FORTIFY_SOURCE=2'
+    cflags += '-Wp,-D_FORTIFY_SOURCE=2 -Wl,-lssp'
   endif
 
   supported_cflags = cc.get_supported_arguments(cflags)