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/add-flags.sh | |
parent | 0dbc0067604eb9629d1458fcf2b226a88e728f14 (diff) | |
download | nixlib-6c064e6b1f34a8416f990db0cc617a7195f71588.tar nixlib-6c064e6b1f34a8416f990db0cc617a7195f71588.tar.gz nixlib-6c064e6b1f34a8416f990db0cc617a7195f71588.tar.bz2 nixlib-6c064e6b1f34a8416f990db0cc617a7195f71588.tar.lz nixlib-6c064e6b1f34a8416f990db0cc617a7195f71588.tar.xz nixlib-6c064e6b1f34a8416f990db0cc617a7195f71588.tar.zst nixlib-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/add-flags.sh')
-rw-r--r-- | pkgs/build-support/bintools-wrapper/add-flags.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh index a97809258954..7d118d20fc68 100644 --- a/pkgs/build-support/bintools-wrapper/add-flags.sh +++ b/pkgs/build-support/bintools-wrapper/add-flags.sh @@ -5,7 +5,6 @@ var_templates_list=( NIX+LDFLAGS_BEFORE NIX+LDFLAGS_AFTER NIX+LDFLAGS_HARDEN - NIX+HARDENING_ENABLE ) var_templates_bool=( NIX+SET_BUILD_ID @@ -24,10 +23,10 @@ if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then fi for var in "${var_templates_list[@]}"; do - mangleVarList "$var" ${role_infixes[@]+"${role_infixes[@]}"} + mangleVarList "$var" "${role_infixes[@]}" done for var in "${var_templates_bool[@]}"; do - mangleVarBool "$var" ${role_infixes[@]+"${role_infixes[@]}"} + mangleVarBool "$var" "${role_infixes[@]}" done if [ -e @out@/nix-support/libc-ldflags ]; then |