build: fix `which` detection on Fedora & MacOS

Fix Fedora 34/35 issue where 'which' detection of 'which' wasn't working
because Fedora use alias and proc

Fixup of fca5ad55d2 prereq-build: fix `which` detection on Fedora

Reported-by: Jani Partanen <[email protected]>
Suggest-by: Etienne Champetier <[email protected]>
Tested-by: Georgi Valkov <[email protected]>
Signed-off-by: Paul Spooren <[email protected]>

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 9242407b1896321b376701a8f8928157c95cfcd0..e1993444f7855695c95ce86d9d8a23825b340d97 100644 (file)
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -186,7 +186,9 @@ $(eval $(call SetupHostCommand,rsync,Please install 'rsync', \
        rsync --version </dev/null))
 
 $(eval $(call SetupHostCommand,which,Please install 'which', \
-       which which | grep which))
+       /usr/bin/which which, \
+       /bin/which which, \
+       which which))
 
 $(STAGING_DIR_HOST)/bin/mkhash: $(SCRIPT_DIR)/mkhash.c
        mkdir -p $(dir $@)