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

wafHook: make crossFlags optional

Browse Source 
The convention of `--cross-compile` and `--cross-execute` is common
enough that it seems like a reasonable default. However there are
projects like mpv which do not use these flags, and rightfully fails
to configure when passed unexpected flags.
This commit is contained in:
Andrew Childs 2020-02-09 15:53:46 +09:00
parent c6791b2117
commit 032d5e7e83
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/build-managers/wafHook/setup-hook.sh
View File

@ -11,11 +11,13 @@ wafConfigurePhase() {
fi fi
local flagsArray=( local flagsArray=(
@crossFlags@
"${flagsArray[@]}" "${flagsArray[@]}"
$wafConfigureFlags "${wafConfigureFlagsArray[@]}" $wafConfigureFlags "${wafConfigureFlagsArray[@]}"
${configureTargets:-configure} ${configureTargets:-configure}
) )
if [ -z "${dontAddWafCrossFlags:-}" ]; then
flagsArray+=(@crossFlags@)
fi
echoCmd 'configure flags' "${flagsArray[@]}" echoCmd 'configure flags' "${flagsArray[@]}"
python "$wafPath" "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}"