From f31275bf8765cb418ccbca2cbd0c534797f04829 Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Fri, 8 Sep 2023 09:20:23 +0200 Subject: [PATCH] Meson: Replace global arguments with project arguments --- meson-archive/code-coverage/meson.build | 2 +- meson-archive/lto/meson.build | 12 ++++++------ meson-archive/pie/meson.build | 4 ++-- meson/auto-var-init/meson.build | 2 +- meson/code-coverage/meson.build | 2 +- meson/compiler-setup/meson.build | 10 ++++++++-- meson/config/meson.build | 2 +- meson/hardening/fortify-source/meson.build | 2 +- meson/hardening/global-offset-table/meson.build | 2 +- meson/hardening/stack-prot/meson.build | 2 +- meson/hardening/stack-smashing-prot/meson.build | 2 +- meson/platform/meson.build | 2 +- meson/sanitizers/meson.build | 2 +- 13 files changed, 26 insertions(+), 20 deletions(-) diff --git a/meson-archive/code-coverage/meson.build b/meson-archive/code-coverage/meson.build index 1ee30a8ec0..ce5df9f6b1 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: ['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 eb9a0f1eea..5c33f41430 100644 --- 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 9f02ee55b2..db035cbbc6 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: ['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 a4bba75ae2..1d528437ea 100644 --- 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 7b188ed6fd..603dfc4341 100644 --- 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 4abc13dd38..77769490e7 100644 --- 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 10a1bcfd97..09c7034829 100644 --- 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 043ffcde4b..2078495a59 100644 --- 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 a9754e5c97..39fce9878f 100644 --- 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 33b8b56435..43d8253afb 100644 --- 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 0baa5018c9..fb24faa8e2 100644 --- 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 52f03c9491..26740bbe80 100644 --- 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 052a7b5157..48047bfc44 100644 --- 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') -- 2.47.2