From 1001d0034c5fb815fffa66bc25d88ad6761a9d00 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 28 Mar 2019 19:59:16 +0100 Subject: [PATCH] wafHook: ignore configurePlatforms 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. --- .../development/tools/build-managers/waf/setup-hook.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/waf/setup-hook.sh b/pkgs/development/tools/build-managers/waf/setup-hook.sh index 01392c9a3423..a837bfd17f29 100644 --- a/pkgs/development/tools/build-managers/waf/setup-hook.sh +++ b/pkgs/development/tools/build-managers/waf/setup-hook.sh @@ -13,12 +13,18 @@ wafConfigurePhase() { local flagsArray=(); for flag in $configureFlags "${configureFlagsArray[@]}"; do + if [[ # waf does not support these flags, but they are "blindly" added by the # pkgsStatic overlay, for example. - if [[ $flag != "--enable-static" + $flag != "--enable-static" && $flag != "--disable-static" && $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 flagsArray=("${flagsArray[@]}" "$flag"); fi;