diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-04-10 15:57:41 -0400 |
|---|---|---|
| committer | Charles Strahan <charles@cstrahan.com> | 2018-04-10 16:33:47 -0400 |
| commit | 2364c22ec903b4836e2610b562174c62d1eb35a7 (patch) | |
| tree | c0a5707a00884b5b0a59efc0f206e002c20785fb /pkgs/build-support/bintools-wrapper | |
| parent | 4c76d8787179ca3be2b117cbed0b94d1b2575b76 (diff) | |
| download | nixpkgs-2364c22ec903b4836e2610b562174c62d1eb35a7.tar nixpkgs-2364c22ec903b4836e2610b562174c62d1eb35a7.tar.gz nixpkgs-2364c22ec903b4836e2610b562174c62d1eb35a7.tar.bz2 nixpkgs-2364c22ec903b4836e2610b562174c62d1eb35a7.tar.lz nixpkgs-2364c22ec903b4836e2610b562174c62d1eb35a7.tar.xz nixpkgs-2364c22ec903b4836e2610b562174c62d1eb35a7.tar.zst nixpkgs-2364c22ec903b4836e2610b562174c62d1eb35a7.zip | |
hardening: line order, spacing, and pointless quoting for consistency
Diffstat (limited to 'pkgs/build-support/bintools-wrapper')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/add-hardening.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh index 19321fcb18b..2ed36df3e1d 100644 --- a/pkgs/build-support/bintools-wrapper/add-hardening.sh +++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh @@ -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 |