colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Specify uses_prefix, uses_suffix and uses_concat3 as local vars. Make sure errors in makeCWrapper are located next to the line with the issue.

Browse Source
This commit is contained in:
Tobias Bergkvist 2021-10-04 14:29:22 +02:00
parent 3df841bb99
commit adef70ce7c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/build-support/setup-hooks/make-binary-wrapper.sh
View File

@ -37,6 +37,7 @@ makeDocumentedCWrapper() {
# ARGS: same as makeBinaryWrapper
makeCWrapper() {
local argv0 n params cmd main flagsBefore flags executable params length
local uses_prefix uses_suffix uses_concat3
executable=$(escapeStringLiteral "$1")
params=("$@")
length=${#params[*]}
@ -47,19 +48,19 @@ makeCWrapper() {
cmd=$(setEnv "${params[n + 1]}" "${params[n + 2]}")
main="$main $cmd"$'\n'
n=$((n + 2))
[ $n -ge "$length" ] && printf '%s\n' " #error makeCWrapper: $p takes 2 arguments"
[ $n -ge "$length" ] && main="$main #error makeCWrapper: $p takes 2 arguments"$'\n'
;;
--set-default)
cmd=$(setDefaultEnv "${params[n + 1]}" "${params[n + 2]}")
main="$main $cmd"$'\n'
n=$((n + 2))
[ $n -ge "$length" ] && printf '%s\n' " #error makeCWrapper: $p takes 2 arguments"
[ $n -ge "$length" ] && main="$main #error makeCWrapper: $p takes 2 arguments"$'\n'
;;
--unset)
cmd=$(unsetEnv "${params[n + 1]}")
main="$main $cmd"$'\n'
n=$((n + 1))
[ $n -ge "$length" ] && printf '%s\n' " #error makeCWrapper: $p takes 1 argument"
[ $n -ge "$length" ] && main="$main #error makeCWrapper: $p takes 1 argument"$'\n'
;;
--prefix)
cmd=$(setEnvPrefix "${params[n + 1]}" "${params[n + 2]}" "${params[n + 3]}")
@ -67,7 +68,7 @@ makeCWrapper() {
uses_prefix=1
uses_concat3=1
n=$((n + 3))
[ $n -ge "$length" ] && printf '%s\n' " #error makeCWrapper: $p takes 3 arguments"
[ $n -ge "$length" ] && main="$main #error makeCWrapper: $p takes 3 arguments"$'\n'
;;
--suffix)
cmd=$(setEnvSuffix "${params[n + 1]}" "${params[n + 2]}" "${params[n + 3]}")
@ -75,21 +76,21 @@ makeCWrapper() {
uses_suffix=1
uses_concat3=1
n=$((n + 3))
[ $n -ge "$length" ] && printf '%s\n' " #error makeCWrapper: $p takes 3 arguments"
[ $n -ge "$length" ] && main="$main #error makeCWrapper: $p takes 3 arguments"$'\n'
;;
--add-flags)
flags="${params[n + 1]}"
flagsBefore="$flagsBefore $flags"
n=$((n + 1))
[ $n -ge "$length" ] && printf '%s\n' " #error makeCWrapper: $p takes 1 argument"
[ $n -ge "$length" ] && main="$main #error makeCWrapper: $p takes 1 argument"$'\n'
;;
--argv0)
argv0=$(escapeStringLiteral "${params[n + 1]}")
n=$((n + 1))
[ $n -ge "$length" ] && printf '%s\n' " #error makeCWrapper: $p takes 1 argument"
[ $n -ge "$length" ] && main="$main #error makeCWrapper: $p takes 1 argument"$'\n'
;;
*) # Using an error macro, we will make sure the compiler gives an understandable error message
printf '%s\n' " #error makeCWrapper: Unknown argument '$p'"
main="$main #error makeCWrapper: Uknown argument ${p}"$'\n'
;;
esac
done