diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-04-10 19:07:27 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-04-10 19:07:27 -0500 |
| commit | 6c064e6b1f34a8416f990db0cc617a7195f71588 (patch) | |
| tree | 4c2a16462fab6bcfb64f7b657e40c56226b2456c /pkgs/build-support/bintools-wrapper/ld-wrapper.sh | |
| parent | 0dbc0067604eb9629d1458fcf2b226a88e728f14 (diff) | |
| download | nixpkgs-6c064e6b1f34a8416f990db0cc617a7195f71588.tar nixpkgs-6c064e6b1f34a8416f990db0cc617a7195f71588.tar.gz nixpkgs-6c064e6b1f34a8416f990db0cc617a7195f71588.tar.bz2 nixpkgs-6c064e6b1f34a8416f990db0cc617a7195f71588.tar.lz nixpkgs-6c064e6b1f34a8416f990db0cc617a7195f71588.tar.xz nixpkgs-6c064e6b1f34a8416f990db0cc617a7195f71588.tar.zst nixpkgs-6c064e6b1f34a8416f990db0cc617a7195f71588.zip | |
Revert "Merge pull request #28029 from cstrahan/hardening-fix"
This reverts commit 0dbc0067604eb9629d1458fcf2b226a88e728f14, reversing changes made to cb7f7742652acdf3086b3d132163b5ea2c2328eb. Should go into staging.
Diffstat (limited to 'pkgs/build-support/bintools-wrapper/ld-wrapper.sh')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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) |