[gnome-color-manager/wip/hughsie/rm-viewer: 1/3] Use newer meson features to fix a build warning



commit 2a962e1a4dcc31de6c856a222a17d865d1950cf7
Author: Richard Hughes <richard hughsie com>
Date:   Thu Feb 7 13:50:51 2019 +0000

    Use newer meson features to fix a build warning

 meson.build | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/meson.build b/meson.build
index 4ed149c..acd0a08 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project('gnome-color-manager', 'c', 'cpp',
   version : '3.30.1',
   license : 'GPL-2.0+',
   default_options : ['warning_level=1'],
-  meson_version : '>=0.37.0'
+  meson_version : '>=0.46.0'
 )
 
 conf = configuration_data()
@@ -65,20 +65,15 @@ endforeach
 
 # enable full RELRO where possible
 # FIXME: until https://github.com/mesonbuild/meson/issues/1140 is fixed
-global_link_args = []
 test_link_args = [
   '-Wl,-z,relro',
   '-Wl,-z,now',
 ]
 foreach arg: test_link_args
-  if cc.has_argument(arg)
-    global_link_args += arg
+  if cc.has_link_argument(arg)
+    add_project_link_arguments(arg, language : 'c')
   endif
 endforeach
-add_global_link_arguments(
-  global_link_args,
-  language: 'c'
-)
 
 prefixed_bindir = join_paths(get_option('prefix'), get_option('bindir'))
 prefixed_localedir = join_paths(get_option('prefix'), get_option('localedir'))


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