Meson: Replace global arguments with project arguments

diff --git a/meson-archive/code-coverage/meson.build b/meson-archive/code-coverage/meson.build
index 1ee30a8ec0c70d77502fd9e789593bf2565ed396..ce5df9f6b1cb0461807f20dbb8117b1e6bec0f76 100644 (file)
--- a/meson-archive/code-coverage/meson.build
+++ b/meson-archive/code-coverage/meson.build
@@ -12,7 +12,7 @@ if code_coverage
     endif
   endforeach
 
-  add_global_arguments(args, language: ['c', 'cpp'])
+  add_project_arguments(args, language: ['c', 'cpp'])
 endif
 
 summary('Code Coverage', code_coverage, bool_yn: true, section: 'Configuration')

diff --git a/meson-archive/lto/meson.build b/meson-archive/lto/meson.build
index eb9a0f1eea91279e9b336aaf1df15a1cda718551..5c33f414306f55ecb2acdd9916fa8644c061bb67 100644 (file)
--- a/meson-archive/lto/meson.build
+++ b/meson-archive/lto/meson.build
@@ -5,8 +5,8 @@ opt_lto = get_option('lto')
 if opt_lto == 'thin'
   compiler_opt = '-flto=thin'
   if cxx.has_argument(compiler_opt)
-    add_global_arguments(compiler_opt, language: ['c', 'cpp'])
-    add_global_link_arguments(compiler_opt, language: ['c', 'cpp'])
+    add_project_arguments(compiler_opt, language: ['c', 'cpp'])
+    add_project_link_arguments(compiler_opt, language: ['c', 'cpp'])
   else
     opt_lto = 'auto'
   endif
@@ -15,8 +15,8 @@ endif
 if opt_lto == 'auto'
   compiler_opt = '-flto=auto'
   if cxx.has_argument(compiler_opt)
-    add_global_arguments(compiler_opt, language: ['c', 'cpp'])
-    add_global_link_arguments(compiler_opt, language: ['c', 'cpp'])
+    add_project_arguments(compiler_opt, language: ['c', 'cpp'])
+    add_project_link_arguments(compiler_opt, language: ['c', 'cpp'])
   else
     opt_lto = 'yes'
   endif
@@ -25,8 +25,8 @@ endif
 if opt_lto == 'yes'
   compiler_opt = '-flto'
   if cxx.has_argument(compiler_opt)
-    add_global_arguments(compiler_opt, language: ['c', 'cpp'])
-    add_global_link_arguments(compiler_opt, language: ['c', 'cpp'])
+    add_project_arguments(compiler_opt, language: ['c', 'cpp'])
+    add_project_link_arguments(compiler_opt, language: ['c', 'cpp'])
   else
     error('LTO was requested but is not supported')
   endif

diff --git a/meson-archive/pie/meson.build b/meson-archive/pie/meson.build
index 9f02ee55b252e387d505b12b03b51d98643ef6a4..db035cbbc6bc4d122ee80050dcc06205aaca2e70 100644 (file)
--- a/meson-archive/pie/meson.build
+++ b/meson-archive/pie/meson.build
@@ -25,8 +25,8 @@ else
     ldflags = variant[1]
 
     if cxx.links(prog, args: cflags + ldflags, name: 'compiler can build Position Independent Executables')
-      add_global_arguments(cflags, language: ['c', 'cpp'])
-      add_global_link_arguments(ldflags, language: ['c', 'cpp'])
+      add_project_arguments(cflags, language: ['c', 'cpp'])
+      add_project_link_arguments(ldflags, language: ['c', 'cpp'])
       found_variant = true
       break
     endif

diff --git a/meson/auto-var-init/meson.build b/meson/auto-var-init/meson.build
index a4bba75ae281d6df15f0dd847024a0c11478c671..1d528437eafc8b2448d245536d1b740b72c3bdaf 100644 (file)
--- a/meson/auto-var-init/meson.build
+++ b/meson/auto-var-init/meson.build
@@ -7,7 +7,7 @@ if auto_var_init != 'disabled'
     subdir_done()
   endif
 
-  add_global_arguments(arg, language: ['c', 'cpp'])
+  add_project_arguments(arg, language: ['c', 'cpp'])
 endif
 
 summary('Auto Var Init', auto_var_init, section: 'Configuration')

diff --git a/meson/code-coverage/meson.build b/meson/code-coverage/meson.build
index 7b188ed6fd0f4404e4b4c21f2f6cb4a8b14f1b02..603dfc4341f95ea42e7e69e7ce553cdfec847c5d 100644 (file)
--- a/meson/code-coverage/meson.build
+++ b/meson/code-coverage/meson.build
@@ -6,7 +6,7 @@ if coverage
   endif
 
   if cxx.has_argument('-U_FORTIFY_SOURCE')
-    add_global_arguments('-U_FORTIFY_SOURCE', language: ['c', 'cpp'])
+    add_project_arguments('-U_FORTIFY_SOURCE', language: ['c', 'cpp'])
   endif
 endif
 

diff --git a/meson/compiler-setup/meson.build b/meson/compiler-setup/meson.build
index 4abc13dd389b85f4ede20e9df39575010813ad52..77769490e70d3c07022f3703c8f1d8110bc0a650 100644 (file)
--- a/meson/compiler-setup/meson.build
+++ b/meson/compiler-setup/meson.build
@@ -1,10 +1,16 @@
 # Don't limit the number of errors when using clang. This is useful to not cut out the
 # error output when using an LSP server like clangd.
 if meson.get_compiler('cpp').get_id() == 'clang'
-  add_global_arguments('-ferror-limit=0', language: ['c', 'cpp'])
+  add_project_arguments('-ferror-limit=0', language: ['c', 'cpp'])
 endif
 
-add_global_arguments('-Wshadow', '-Wmissing-declarations', '-Wredundant-decls', '-Wno-ignored-attributes', language: ['c', 'cpp'])
+add_project_arguments(
+  '-Wshadow',
+  '-Wmissing-declarations',
+  '-Wredundant-decls',
+  '-Wno-ignored-attributes',
+  language: ['c', 'cpp'],
+)
 
 cxx = meson.get_compiler('cpp')
 system = target_machine.system()

diff --git a/meson/config/meson.build b/meson/config/meson.build
index 10a1bcfd97167fdf54c77b392829f7e93801c893..09c7034829361fd763cc5a6977984dfaa4dc44b9 100644 (file)
--- a/meson/config/meson.build
+++ b/meson/config/meson.build
@@ -1 +1 @@
-add_global_arguments('-DHAVE_CONFIG_H', language: ['c', 'cpp'])
+add_project_arguments('-DHAVE_CONFIG_H', language: ['c', 'cpp'])

diff --git a/meson/hardening/fortify-source/meson.build b/meson/hardening/fortify-source/meson.build
index 043ffcde4b946f29ee39dfd70af8d19b9cac7cd3..2078495a594b872f092b8dd0df8e165830c9b423 100644 (file)
--- a/meson/hardening/fortify-source/meson.build
+++ b/meson/hardening/fortify-source/meson.build
@@ -15,7 +15,7 @@ if fortify_source
     variant_str = variant.to_string()
     if fortify_source_level == variant
       if cxx.has_argument('-D_FORTIFY_SOURCE=' + variant_str)
-        add_global_arguments('-U_FORTIFY_SOURCE', '-D_FORTIFY_SOURCE=' + variant_str, language: ['c', 'cpp'])
+        add_project_arguments('-U_FORTIFY_SOURCE', '-D_FORTIFY_SOURCE=' + variant_str, language: ['c', 'cpp'])
         break
       else
         fortify_source_level = fortify_source_level - 1

diff --git a/meson/hardening/global-offset-table/meson.build b/meson/hardening/global-offset-table/meson.build
index a9754e5c9732806cbec6bf46d1e4e56b294249a0..39fce9878f9ecf581ea3b5cda90c6acdc08017d6 100644 (file)
--- a/meson/hardening/global-offset-table/meson.build
+++ b/meson/hardening/global-offset-table/meson.build
@@ -4,7 +4,7 @@ found_variant = false
 foreach variant: variants
   if ld_help.contains('-z ' + variant)
     found_variant = true
-    add_global_link_arguments('-Wl,-z', '-Wl,' + variant, language: ['c', 'cpp'])
+    add_project_link_arguments('-Wl,-z', '-Wl,' + variant, language: ['c', 'cpp'])
   endif
 endforeach
 

diff --git a/meson/hardening/stack-prot/meson.build b/meson/hardening/stack-prot/meson.build
index 33b8b564351323982df7f8a1cae1756b597d32d4..43d8253afbe795ef21d82a1efa8c1cdb8d234b76 100644 (file)
--- a/meson/hardening/stack-prot/meson.build
+++ b/meson/hardening/stack-prot/meson.build
@@ -1,7 +1,7 @@
 support_stack_protector = cxx.has_argument('-fstack-protector')
 
 if support_stack_protector
-  add_global_arguments('-fstack-protector', language: ['c', 'cpp'])
+  add_project_arguments('-fstack-protector', language: ['c', 'cpp'])
 endif
 
 hardening_features += [[support_stack_protector, 'Stack Protector']]

diff --git a/meson/hardening/stack-smashing-prot/meson.build b/meson/hardening/stack-smashing-prot/meson.build
index 0baa5018c9cfed7e95cb0911aafe951b749af7a1..fb24faa8e28bbe600cf6bb71fb0848e09d4daf93 100644 (file)
--- a/meson/hardening/stack-smashing-prot/meson.build
+++ b/meson/hardening/stack-smashing-prot/meson.build
@@ -1,6 +1,6 @@
 support_stack_smashing_protector = cxx.has_argument('--param=ssp-buffer-size=4')
 if support_stack_smashing_protector
-  add_global_arguments('--param=ssp-buffer-size=4', language: ['c', 'cpp'])
+  add_project_arguments('--param=ssp-buffer-size=4', language: ['c', 'cpp'])
 endif
 
 hardening_features += [[support_stack_smashing_protector, 'Stack Smashing Protection']]

diff --git a/meson/platform/meson.build b/meson/platform/meson.build
index 52f03c94912604f534d9bfdde73587e750637364..26740bbe80a6725810cdc67a5cee8625ccc3c5e5 100644 (file)
--- a/meson/platform/meson.build
+++ b/meson/platform/meson.build
@@ -27,7 +27,7 @@ foreach platform: platforms
     endforeach
 
     foreach arg: args
-      add_global_arguments('-D' + arg, language: ['c', 'cpp'])
+      add_project_arguments('-D' + arg, language: ['c', 'cpp'])
     endforeach
 
     foreach lib: libs

diff --git a/meson/sanitizers/meson.build b/meson/sanitizers/meson.build
index 052a7b51576591aa0a1b89e6956ee5412305d4b4..48047bfc440483e5acb522f241b7ed811f3edf36 100644 (file)
--- a/meson/sanitizers/meson.build
+++ b/meson/sanitizers/meson.build
@@ -5,7 +5,7 @@ if opt_sanitize == 'address' or opt_sanitize == 'address,undefined'
 endif
 
 if opt_sanitize != '' and opt_sanitize != 'none'
-  add_global_arguments('-fno-omit-frame-pointer', language: ['c', 'cpp'])
+  add_project_arguments('-fno-omit-frame-pointer', language: ['c', 'cpp'])
 endif
 
 summary('Sanitizers', opt_sanitize, bool_yn: true, section: 'Configuration')