From: Paul Spooren <mail@aparcar.org>
Date: Sat, 2 Oct 2021 01:56:27 +0000 (-1000)
Subject: build: fix `which` detection on Fedora & MacOS
X-Git-Tag: v21.02.1~25
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=913403b587451abaaf67e8f9640f0dc2cdcec95d;p=openwrt%2Fopenwrt.git

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 <rtfm@iki.fi>
Suggest-by: Etienne Champetier <champetier.etienne@gmail.com>
Tested-by: Georgi Valkov <gvalkov@abv.bg>
Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit 0d1ebf0d6d20f0439ab45b293f9daa7662c44ba6)
---

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 538aee58fe..623881c93f 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -182,7 +182,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 $@)