From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Tue, 8 Aug 2023 13:20:09 +0000 (+0200)
Subject: Meson: Also add global compiler arguments for C files
X-Git-Tag: rec-5.1.0-alpha1~80^2~285
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c63c42cfc64dd536a2b625f7c5460ada0b39d60e;p=thirdparty%2Fpdns.git

Meson: Also add global compiler arguments for C files
---

diff --git a/meson-archive/code-coverage/meson.build b/meson-archive/code-coverage/meson.build
index bdfbe842fb..1ee30a8ec0 100644
--- 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: ['cpp'])
+  add_global_arguments(args, language: ['c', 'cpp'])
 endif
 
 summary('Code Coverage', code_coverage, bool_yn: true, section: 'Configuration')
diff --git a/meson-archive/pie/meson.build b/meson-archive/pie/meson.build
index 2f83d7f24e..9f02ee55b2 100644
--- 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: ['cpp'])
-      add_global_link_arguments(ldflags, language: ['cpp'])
+      add_global_arguments(cflags, language: ['c', 'cpp'])
+      add_global_link_arguments(ldflags, language: ['c', 'cpp'])
       found_variant = true
       break
     endif
diff --git a/meson.build b/meson.build
index e9e45c7348..b7d7effc0f 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,7 @@ summary('Build Dir', product_build_dir, section: 'Build')
 fs = import('fs')
 
 # Create the configuration object and dependencies list.
-add_global_arguments('-DHAVE_CONFIG_H', language: ['cpp'])
+add_global_arguments('-DHAVE_CONFIG_H', language: ['c', 'cpp'])
 conf = configuration_data()
 deps = []
 
diff --git a/meson/auto-var-init/meson.build b/meson/auto-var-init/meson.build
index a3c5552e31..83346293a6 100644
--- a/meson/auto-var-init/meson.build
+++ b/meson/auto-var-init/meson.build
@@ -9,7 +9,7 @@ if auto_var_init != 'disabled'
     subdir_done()
   endif
 
-  add_global_arguments(arg, language: ['cpp'])
+  add_global_arguments(arg, language: ['c', 'cpp'])
 endif
 
 summary('Auto Var Init', auto_var_init, section: 'Configuration')
diff --git a/meson/compiler-setup/meson.build b/meson/compiler-setup/meson.build
index 994c611e31..29599f0e6c 100644
--- a/meson/compiler-setup/meson.build
+++ b/meson/compiler-setup/meson.build
@@ -4,10 +4,10 @@
 # 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: ['cpp'])
+  add_global_arguments('-ferror-limit=0', language: ['c', 'cpp'])
 endif
 
-add_global_arguments('-Wshadow', '-Wmissing-declarations', '-Wredundant-decls', language: ['cpp'])
+add_global_arguments('-Wshadow', '-Wmissing-declarations', '-Wredundant-decls', language: ['c', 'cpp'])
 
 cxx = meson.get_compiler('cpp')
 system = target_machine.system()
diff --git a/meson/hardening/fortify-source/meson.build b/meson/hardening/fortify-source/meson.build
index a13cad11ea..2f260cc414 100644
--- a/meson/hardening/fortify-source/meson.build
+++ b/meson/hardening/fortify-source/meson.build
@@ -16,7 +16,7 @@ if fortify_source_opt != 'disabled'
     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: ['cpp'])
+        add_global_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 24c35e3d51..45f97e0230 100644
--- a/meson/hardening/global-offset-table/meson.build
+++ b/meson/hardening/global-offset-table/meson.build
@@ -7,7 +7,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: ['cpp'])
+    add_global_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 90282b7d08..bede72a305 100644
--- a/meson/hardening/stack-prot/meson.build
+++ b/meson/hardening/stack-prot/meson.build
@@ -4,7 +4,7 @@
 support_stack_protector = cxx.has_argument('-fstack-protector')
 
 if support_stack_protector
-  add_global_arguments('-fstack-protector', language: ['cpp'])
+  add_global_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 e0440bc958..7a529a60ca 100644
--- a/meson/hardening/stack-smashing-prot/meson.build
+++ b/meson/hardening/stack-smashing-prot/meson.build
@@ -3,7 +3,7 @@
 
 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: ['cpp'])
+  add_global_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 cff51b7a40..a77d4e1848 100644
--- a/meson/platform/meson.build
+++ b/meson/platform/meson.build
@@ -28,7 +28,7 @@ foreach platform: platforms
     endforeach
 
     foreach arg: args
-      add_global_arguments('-D' + arg, language: ['cpp'])
+      add_global_arguments('-D' + arg, language: ['c', 'cpp'])
     endforeach
 
     foreach lib: libs