From 6c064e6b1f34a8416f990db0cc617a7195f71588 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 10 Apr 2018 19:07:27 -0500 Subject: Revert "Merge pull request #28029 from cstrahan/hardening-fix" This reverts commit 0dbc0067604eb9629d1458fcf2b226a88e728f14, reversing changes made to cb7f7742652acdf3086b3d132163b5ea2c2328eb. Should go into staging. --- pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/build-support/bintools-wrapper/ld-wrapper.sh') diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 672a3dcbe38..991ed0fe263 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -57,8 +57,8 @@ fi source @out@/nix-support/add-hardening.sh -extraAfter=() -extraBefore=(${hardeningLDFlags[@]+"${hardeningLDFlags[@]}"}) +extraAfter=("${hardeningLDFlags[@]}") +extraBefore=() if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then extraAfter+=($NIX_@infixSalt@_LDFLAGS) -- cgit 1.4.1