diff options
| author | Charles Strahan <charles@cstrahan.com> | 2018-04-10 15:27:13 -0400 |
|---|---|---|
| committer | Charles Strahan <charles@cstrahan.com> | 2018-04-10 15:27:13 -0400 |
| commit | 386e77dae9f5ba2cead9984ee737a8a6b7069bf5 (patch) | |
| tree | 39d5d5b1886b2e1e0a244d31698926cf8b0b3422 /pkgs/build-support/bintools-wrapper | |
| parent | 273ce83f29a24aefd8656dc3c031f56ba543376c (diff) | |
| download | nixlib-386e77dae9f5ba2cead9984ee737a8a6b7069bf5.tar nixlib-386e77dae9f5ba2cead9984ee737a8a6b7069bf5.tar.gz nixlib-386e77dae9f5ba2cead9984ee737a8a6b7069bf5.tar.bz2 nixlib-386e77dae9f5ba2cead9984ee737a8a6b7069bf5.tar.lz nixlib-386e77dae9f5ba2cead9984ee737a8a6b7069bf5.tar.xz nixlib-386e77dae9f5ba2cead9984ee737a8a6b7069bf5.tar.zst nixlib-386e77dae9f5ba2cead9984ee737a8a6b7069bf5.zip | |
hardening: simplify reporting of disabled flags
Diffstat (limited to 'pkgs/build-support/bintools-wrapper')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/add-hardening.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh index 0f62aa49542a..c81c3b2f2105 100644 --- a/pkgs/build-support/bintools-wrapper/add-hardening.sh +++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh @@ -1,4 +1,3 @@ -allHardeningFlags=(pie relro bindnow) hardeningFlags=() declare -A hardeningEnableMap=() @@ -11,19 +10,14 @@ for flag in ${NIX_@infixSalt@_HARDENING_ENABLE-}; do done # Remove unsupported flags. -if (( "${NIX_DEBUG:-0}" >= 1 )); then - declare -A hardeningDisableMap=() -fi for flag in @hardening_unsupported_flags@; do - [[ -n ${hardeningEnableMap[$flag]} ]] || continue - if (( "${NIX_DEBUG:-0}" >= 1 )); then - hardeningDisableMap[$flag]=1 - fi unset hardeningEnableMap[$flag] done if (( "${NIX_DEBUG:-0}" >= 1 )); then # Determine which flags were effectively disabled so we can report below. + allHardeningFlags=(pie relro bindnow) + declare -A hardeningDisableMap=() for flag in ${allHardeningFlags[@]}; do if [[ -z "${hardeningEnableMap[$flag]-}" ]]; then hardeningDisableMap[$flag]=1 |