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/cc-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/cc-wrapper/add-flags.sh')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/add-flags.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index e384d30ecbb6..604aaf6b6cf0 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -30,10 +30,10 @@ fi # We need to mangle names for hygiene, but also take parameters/overrides # from the environment. 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 # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld. |