diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-31 14:43:09 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-13 16:08:13 -0500 |
commit | fc7ed8691505c502b2d05b9b14bb46f239976315 (patch) | |
tree | 5c3501c321ffea7fe839033681531a141b45b2a4 /pkgs/build-support/cc-wrapper/add-flags.sh | |
parent | 45d4b27d025ec71adc1218bcb2c02e50bcc08492 (diff) |
cc-wrapper: Pull variable mangler into utils.sh
In preparation for splitting out bintools-wrapper
Diffstat (limited to 'pkgs/build-support/cc-wrapper/add-flags.sh')
-rw-r--r-- | pkgs/build-support/cc-wrapper/add-flags.sh | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 39633fce69a81..5f7c071fb9cf0 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -36,16 +36,7 @@ fi # We need to mangle names for hygiene, but also take parameters/overrides # from the environment. for var in "${var_templates[@]}"; do - outputVar="${var/+/_@infixSalt@_}" - export ${outputVar}+='' - # For each role we serve, we accumulate the input parameters into our own - # cc-wrapper-derivation-specific environment variables. - for infix in "${role_infixes[@]}"; do - inputVar="${var/+/${infix}}" - if [ -v "$inputVar" ]; then - export ${outputVar}+="${!outputVar:+ }${!inputVar}" - fi - done + mangleVarList "$var" "${role_infixes[@]}" done # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld. |