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

wafHook: ignore configurePlatforms

Browse Source 
waf does support --build and --host, but the only effect of these
options is an error message telling to use --cross-compile instead.
So we ignore these flags.
This commit is contained in:
Symphorien Gibol 2019-03-28 19:59:16 +01:00
parent f23a21514c
commit 1001d0034c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/build-managers/waf/setup-hook.sh
View File

@ -13,12 +13,18 @@ wafConfigurePhase() {
local flagsArray=(); local flagsArray=();
for flag in $configureFlags "${configureFlagsArray[@]}"; for flag in $configureFlags "${configureFlagsArray[@]}";
do do
if [[
# waf does not support these flags, but they are "blindly" added by the # waf does not support these flags, but they are "blindly" added by the
# pkgsStatic overlay, for example. # pkgsStatic overlay, for example.
if [[ $flag != "--enable-static" $flag != "--enable-static"
&& $flag != "--disable-static" && $flag != "--disable-static"
&& $flag != "--enable-shared" && $flag != "--enable-shared"
&& $flag != "--disable-shared" ]]; && $flag != "--disable-shared"
# these flags are added by configurePlatforms but waf just uses them
# to bail out in cross compilation cases
&& $flag != --build=*
&& $flag != --host=*
]];
then then
flagsArray=("${flagsArray[@]}" "$flag"); flagsArray=("${flagsArray[@]}" "$flag");
fi; fi;