Meson: Move fortify-source out of the normal set of hardening features

diff --git a/meson/hardening/fortify-source/meson.build b/meson/hardening/fortify-source/meson.build
index ddeff4ac4e0ef757c96bbd70d016f7e8753401ef..2ef4ea9c98115d892ecff485bb93762069d54194 100644 (file)
--- 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 e80ed091c029f01098783b49459e3d116cc6bf8f..18d716153236e6aae0a4edec715b561e2f329cb3 100644 (file)
--- 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