diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-04-11 14:00:13 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-04-11 14:00:13 -0400 |
| commit | 0884027ef56c0e7cac94e1c0a42c2a1610c8ef5c (patch) | |
| tree | 8ca677cf85cbb6857b6a10d7bd27360a3281685a /pkgs/build-support/bintools-wrapper/add-flags.sh | |
| parent | 27dd87222769bc602d34c5a5c2a13f492f432dbe (diff) | |
| download | nixpkgs-0884027ef56c0e7cac94e1c0a42c2a1610c8ef5c.tar nixpkgs-0884027ef56c0e7cac94e1c0a42c2a1610c8ef5c.tar.gz nixpkgs-0884027ef56c0e7cac94e1c0a42c2a1610c8ef5c.tar.bz2 nixpkgs-0884027ef56c0e7cac94e1c0a42c2a1610c8ef5c.tar.lz nixpkgs-0884027ef56c0e7cac94e1c0a42c2a1610c8ef5c.tar.xz nixpkgs-0884027ef56c0e7cac94e1c0a42c2a1610c8ef5c.tar.zst nixpkgs-0884027ef56c0e7cac94e1c0a42c2a1610c8ef5c.zip | |
Revert "Revert "Merge pull request #28029 from cstrahan/hardening-fix""
This reverts commit 6c064e6b1f34a8416f990db0cc617a7195f71588, reapplying PR #28029 which was supposed to have gone to staging all along.
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, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh index 7d118d20fc6..a9780925895 100644 --- a/pkgs/build-support/bintools-wrapper/add-flags.sh +++ b/pkgs/build-support/bintools-wrapper/add-flags.sh @@ -5,6 +5,7 @@ var_templates_list=( NIX+LDFLAGS_BEFORE NIX+LDFLAGS_AFTER NIX+LDFLAGS_HARDEN + NIX+HARDENING_ENABLE ) var_templates_bool=( NIX+SET_BUILD_ID @@ -23,10 +24,10 @@ if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then fi for var in "${var_templates_list[@]}"; do - mangleVarList "$var" "${role_infixes[@]}" + mangleVarList "$var" ${role_infixes[@]+"${role_infixes[@]}"} done for var in "${var_templates_bool[@]}"; do - mangleVarBool "$var" "${role_infixes[@]}" + mangleVarBool "$var" ${role_infixes[@]+"${role_infixes[@]}"} done if [ -e @out@/nix-support/libc-ldflags ]; then |