mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-02 10:31:36 +00:00
wafHook: ignore --disable-static and such options
These options are forcefully added by pkgsStatic but are not understood by waf.
This commit is contained in:
parent
f075de5c25
commit
f23a21514c
|
@ -10,8 +10,21 @@ wafConfigurePhase() {
|
|||
configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
|
||||
fi
|
||||
|
||||
local flagsArray=(
|
||||
$configureFlags ${configureFlagsArray[@]}
|
||||
local flagsArray=();
|
||||
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}
|
||||
)
|
||||
echoCmd 'configure flags' "${flagsArray[@]}"
|
||||
|
|
Loading…
Reference in a new issue