diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-23 16:39:15 -0400 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2017-08-25 15:10:02 -0400 |
| commit | a470be5a16e54ebdda7d1e61ca1e74f82aed3199 (patch) | |
| tree | a1b442629361e3c18f94743a33017d219a4b1d68 /pkgs/build-support/cc-wrapper | |
| parent | 287fce6402100c40317233de6b4f749f2b79b0a5 (diff) | |
| download | nixlib-a470be5a16e54ebdda7d1e61ca1e74f82aed3199.tar nixlib-a470be5a16e54ebdda7d1e61ca1e74f82aed3199.tar.gz nixlib-a470be5a16e54ebdda7d1e61ca1e74f82aed3199.tar.bz2 nixlib-a470be5a16e54ebdda7d1e61ca1e74f82aed3199.tar.lz nixlib-a470be5a16e54ebdda7d1e61ca1e74f82aed3199.tar.xz nixlib-a470be5a16e54ebdda7d1e61ca1e74f82aed3199.tar.zst nixlib-a470be5a16e54ebdda7d1e61ca1e74f82aed3199.zip | |
expand-response-params: Build more normally
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/build-support/cc-wrapper/utils.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index d5ae64c9c5ff..bb95c1807ab9 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -342,7 +342,8 @@ stdenv.mkDerivation { inherit dynamicLinker expand-response-params; - expandResponseParams = expand-response-params; # for substitution in utils.sh + # for substitution in utils.sh + expandResponseParams = "${expand-response-params}/bin/expand-response-params"; crossAttrs = { shell = shell.crossDrv + shell.crossDrv.shellPath; diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh index 7e9979f10ae8..c84a094e26b0 100644 --- a/pkgs/build-support/cc-wrapper/utils.sh +++ b/pkgs/build-support/cc-wrapper/utils.sh @@ -30,7 +30,7 @@ expandResponseParams() { if [[ "$arg" == @* ]]; then # phase separation makes this look useless # shellcheck disable=SC2157 - if [ -n "@expandResponseParams@" ]; then + if [ -x "@expandResponseParams@" ]; then # params is used by caller #shellcheck disable=SC2034 readarray -d '' params < <("@expandResponseParams@" "$@") |