Revert "Revert "Merge pull request #28029 from cstrahan/hardening-fix""

This reverts commit 6c064e6b1f, reapplying PR #28029 which was supposed to have gone to staging all along.
2018-04-11 14:00:13 -04:00
parent 27dd872227
commit 0884027ef5
9 changed files with 130 additions and 104 deletions
@@ -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[@]}"
+    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

 # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.