aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Spooren <mail@aparcar.org>2021-10-01 15:56:27 -1000
committerPaul Spooren <mail@aparcar.org>2021-10-02 19:53:24 -1000
commit0d1ebf0d6d20f0439ab45b293f9daa7662c44ba6 (patch)
treef0d1051fe239a6a6587255b024183971fd3c5ac3
parent57b323ce38f327557d1b016dddd712bb4a8e0854 (diff)
downloadupstream-0d1ebf0d6d20f0439ab45b293f9daa7662c44ba6.tar.gz
upstream-0d1ebf0d6d20f0439ab45b293f9daa7662c44ba6.tar.bz2
upstream-0d1ebf0d6d20f0439ab45b293f9daa7662c44ba6.zip
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>
-rw-r--r--include/prereq-build.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 9242407b18..e1993444f7 100644
--- 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 $@)