Revert "Revert "Merge pull request #28029 from cstrahan/hardening-fix""

This reverts commit 6c064e6b1f, reapplying PR #28029 which was supposed to have gone to staging all along.
2018-04-11 14:00:13 -04:00
parent 27dd872227
commit 0884027ef5
9 changed files with 130 additions and 104 deletions
@@ -57,8 +57,8 @@ fi

 source @out@/nix-support/add-hardening.sh

-extraAfter=("${hardeningLDFlags[@]}")
-extraBefore=()
+extraAfter=()
+extraBefore=(${hardeningLDFlags[@]+"${hardeningLDFlags[@]}"})

 if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then
    extraAfter+=($NIX_@infixSalt@_LDFLAGS)