From 5afd5b8e9dbddc4a0e94b953c7c53a472f0cd70e Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Fri, 13 Oct 2023 10:17:05 +0200 Subject: [PATCH] Meson: Move fortify-source out of the normal set of hardening features --- meson/hardening/fortify-source/meson.build | 2 -- meson/hardening/meson.build | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/meson/hardening/fortify-source/meson.build b/meson/hardening/fortify-source/meson.build index ddeff4ac4e..2ef4ea9c98 100644 --- a/meson/hardening/fortify-source/meson.build +++ b/meson/hardening/fortify-source/meson.build @@ -27,8 +27,6 @@ if fortify_source endif endif endforeach - - hardening_features += [[fortify_source_level != 0, 'Source Fortification']] endif fortify_source = fortify_source and fortify_source_level != 0 diff --git a/meson/hardening/meson.build b/meson/hardening/meson.build index e80ed091c0..18d7161532 100644 --- a/meson/hardening/meson.build +++ b/meson/hardening/meson.build @@ -13,7 +13,6 @@ if opt_hardening.enabled() or opt_hardening.auto() subdir('stack-prot') # Stack Protector subdir('stack-smashing-prot') # Stack-Smashing Protection - subdir('fortify-source') # Fortify Source subdir('relro') # RELRO foreach feature: hardening_features @@ -30,3 +29,4 @@ if opt_hardening.enabled() or opt_hardening.auto() endforeach endif +subdir('fortify-source') # Fortify Source -- 2.47.2