mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 10:31:36 +00:00
Code Issues Wiki Activity

wafHook: ignore --disable-static and such options

Browse source 
These options are forcefully added by pkgsStatic but are not understood
by waf.
This commit is contained in:
Symphorien Gibol 2019-03-28 18:33:08 +01:00
parent f075de5c25
commit f23a21514c
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/tools/build-managers/waf/setup-hook.sh
View file

@ -10,8 +10,21 @@ wafConfigurePhase() {
configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
fi fi
local flagsArray=( local flagsArray=();
$configureFlags ${configureFlagsArray[@]} for flag in $configureFlags "${configureFlagsArray[@]}";
do
# waf does not support these flags, but they are "blindly" added by the
# pkgsStatic overlay, for example.
if [[ $flag != "--enable-static"
&& $flag != "--disable-static"
&& $flag != "--enable-shared"
&& $flag != "--disable-shared" ]];
then
flagsArray=("${flagsArray[@]}" "$flag");
fi;
done
flagsArray=(
"${flagsArray[@]}"
${configureTargets:-configure} ${configureTargets:-configure}
) )
echoCmd 'configure flags' "${flagsArray[@]}" echoCmd 'configure flags' "${flagsArray[@]}"