alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

responsie file logic

Browse source
This commit is contained in:
Moritz Angermann 2021-02-09 09:46:47 +08:00
parent ece4c62d4b
commit 11b4d6c633
No known key found for this signature in database
GPG key ID: A98C646D142C675F
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/build-support/cc-wrapper/cc-wrapper.sh
View file

@ -180,7 +180,18 @@ fi
PATH="$path_backup" PATH="$path_backup"
# Old bash workaround, see above. # Old bash workaround, see above.
exec @prog@ \
${extraBefore+"${extraBefore[@]}"} \ if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then
${params+"${params[@]}"} \ RESPONSE_FILE=$(mktemp)
${extraAfter+"${extraAfter[@]}"} printf "%q\n" \
${extraBefore+"${extraBefore[@]}"} \
${params+"${params[@]}"} \
${extraAfter+"${extraAfter[@]}"} \
> "${RESPONSE_FILE}"
exec @prog@ "@${RESPONSE_FILE}"
else
exec @prog@ \
${extraBefore+"${extraBefore[@]}"} \
${params+"${params[@]}"} \
${extraAfter+"${extraAfter[@]}"}
fi

1
pkgs/build-support/cc-wrapper/default.nix
View file

@ -121,6 +121,7 @@ stdenv.mkDerivation {
local dst="$1" local dst="$1"
local wrapper="$2" local wrapper="$2"
export prog="$3" export prog="$3"
export use_response_file_by_default=${if isClang then "1" else "0"}
substituteAll "$wrapper" "$out/bin/$dst" substituteAll "$wrapper" "$out/bin/$dst"
chmod +x "$out/bin/$dst" chmod +x "$out/bin/$dst"
} }

2
pkgs/build-support/expand-response-params/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation {
src=$PWD src=$PWD
''; '';
buildPhase = '' buildPhase = ''
"$CC" -std=c99 -O3 -o "expand-response-params" expand-response-params.c NIX_CC_USE_RESPONSE_FILE=0 "$CC" -std=c99 -O3 -o "expand-response-params" expand-response-params.c
''; '';
installPhase = '' installPhase = ''
mkdir -p $prefix/bin mkdir -p $prefix/bin