Просмотр исходного кода

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]>
Paul Spooren 4 лет назад
Родитель
Сommit
0d1ebf0d6d
1 измененных файлов с 3 добавлено и 1 удалено
  1. 3 1
      include/prereq-build.mk

+ 3 - 1
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 $@)