cc-wrapper: Unconditionally use @infixSalt@ accross the board

This is basically a sed job, in preparation of the next commit. The
rules are more or less:

  - s"NIX_(.._WRAPPER_)?([a-zA-Z0-9@]*)"NIX_\1@infixSalt@_\2"g

  - except for non-cc-wrapper-specific vars like `NIX_DEBUG`
This commit is contained in:
John Ericson
2017-08-07 03:05:50 -04:00
parent 5ba3972add
commit 9f1e009975
6 changed files with 63 additions and 63 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
addCVars () {
ccWrapper_addCVars () {
if [[ -d "$1/include" ]]; then
export NIX_CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include"
fi
@@ -16,7 +16,7 @@ addCVars () {
fi
}
envHooks+=(addCVars)
envHooks+=(ccWrapper_addCVars)
# Note 1: these come *after* $out in the PATH (see setup.sh).
# Note 2: phase separation makes this look useless to shellcheck.