From 032d5e7e837eaa295f2afec87a39a4ced2c1bc97 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sun, 9 Feb 2020 15:53:46 +0900 Subject: [PATCH] wafHook: make crossFlags optional 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. --- pkgs/development/tools/build-managers/wafHook/setup-hook.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh index 0cce57677bd..a9496b76b21 100644 --- a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh +++ b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh @@ -11,11 +11,13 @@ wafConfigurePhase() { fi local flagsArray=( - @crossFlags@ "${flagsArray[@]}" $wafConfigureFlags "${wafConfigureFlagsArray[@]}" ${configureTargets:-configure} ) + if [ -z "${dontAddWafCrossFlags:-}" ]; then + flagsArray+=(@crossFlags@) + fi echoCmd 'configure flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}"