Unverified Commit 25920d8d authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #253194 from risicle/ris-nix-hardening-enable-fortify3-imply-fortify 

cc-wrapper: ensure `NIX_HARDENING_ENABLE` `fortify3` implies `fortify` too
parents 2c2c0379 4c6fd59f

pkgs/build-support/cc-wrapper/add-hardening.sh

+8 −1
Original line number Diff line number Diff line
@@ -10,6 +10,13 @@ for flag in ${NIX_HARDENING_ENABLE_@suffixSalt@-}; do 
  hardeningEnableMap["$flag"]=1

done



# fortify3 implies fortify enablement - make explicit before

# we filter unsupported flags because unsupporting fortify3

# doesn't mean we should unsupport fortify too

if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then

  hardeningEnableMap["fortify"]=1

fi



# Remove unsupported flags.

for flag in @hardening_unsupported_flags@; do

  unset -v "hardeningEnableMap[$flag]"
@@ -19,7 +26,7 @@ for flag in @hardening_unsupported_flags@; do 
  fi

done



# make fortify and fortify3 mutually exclusive

# now make fortify and fortify3 mutually exclusive

if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then

  unset -v "hardeningEnableMap['fortify']"

fi