nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

hardening: line order, spacing, and pointless quoting for consistency

Browse Source
This commit is contained in:
John Ericson 2018-04-10 15:57:41 -04:00 committed by Charles Strahan
parent 4c76d87871
commit 2364c22ec9
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/bintools-wrapper/add-hardening.sh
View File

@ -6,7 +6,7 @@ declare -A hardeningEnableMap=()
# array expansion also prevents undefined variables from causing trouble with
# `set -u`.
for flag in ${NIX_@infixSalt@_HARDENING_ENABLE-}; do
hardeningEnableMap[$flag]=1
hardeningEnableMap["$flag"]=1
done
# Remove unsupported flags.
@ -15,9 +15,10 @@ for flag in @hardening_unsupported_flags@; do
done
if (( "${NIX_DEBUG:-0}" >= 1 )); then
# Determine which flags were effectively disabled so we can report below.
declare -a allHardeningFlags=(pie relro bindnow)
declare -A hardeningDisableMap=()
# Determine which flags were effectively disabled so we can report below.
for flag in "${allHardeningFlags[@]}"; do
if [[ -z "${hardeningEnableMap[$flag]-}" ]]; then
hardeningDisableMap[$flag]=1

7
pkgs/build-support/cc-wrapper/add-hardening.sh
View File

@ -6,7 +6,7 @@ declare -A hardeningEnableMap=()
# array expansion also prevents undefined variables from causing trouble with
# `set -u`.
for flag in ${NIX_@infixSalt@_HARDENING_ENABLE-}; do
hardeningEnableMap[$flag]=1
hardeningEnableMap["$flag"]=1
done
# Remove unsupported flags.
@ -15,12 +15,13 @@ for flag in @hardening_unsupported_flags@; do
done
if (( "${NIX_DEBUG:-0}" >= 1 )); then
# Determine which flags were effectively disabled so we can report below.
declare -a allHardeningFlags=(fortify stackprotector pie pic strictoverflow format)
declare -A hardeningDisableMap=()
# Determine which flags were effectively disabled so we can report below.
for flag in "${allHardeningFlags[@]}"; do
if [[ -z "${hardeningEnableMap[$flag]-}" ]]; then
hardeningDisableMap[$flag]=1
hardeningDisableMap["$flag"]=1
fi
done