From 5587bf15db2e99240e9607f13688c3f4674f4697 Mon Sep 17 00:00:00 2001 From: laanwj <126646+laanwj@users.noreply.github.com> Date: Wed, 2 Feb 2022 19:18:26 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#24156: build: Replace `which` command with `command -v` 148b33cf72033eced8a701d127e21dfe8a816ce3 build: Replace `which` command with `command -v` (Hennadii Stepanov) Pull request description: On some systems the `which` command can emit messages into stderr. For example, for `debianutils 5.5-1` package in Debian Sid: ``` # which cat /usr/bin/which: this version of `which' is deprecated; use `command -v' in scripts instead. /bin/cat ``` Although such messages are harmless, they could distract developers needlessly (see bitcoin/bitcoin#24056). Fixes bitcoin/bitcoin#24056. ACKs for top commit: dongcarl: Code Review ACK 148b33cf72033eced8a701d127e21dfe8a816ce3 laanwj: Code review ACK 148b33cf72033eced8a701d127e21dfe8a816ce3 Tree-SHA512: 36ee45d8831afb75a1ba6f8c8491fa5381159a2b86042140ac09037752f74e92d3e725caa793b8e97c36afe03ada0b557eede95df2bec049173c27f32ffc804a --- depends/hosts/mingw32.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/hosts/mingw32.mk b/depends/hosts/mingw32.mk index 8f9b76eec9..48020d71af 100644 --- a/depends/hosts/mingw32.mk +++ b/depends/hosts/mingw32.mk @@ -1,4 +1,4 @@ -ifneq ($(shell which $(host)-g++-posix),) +ifneq ($(shell $(SHELL) $(.SHELLFLAGS) "command -v $(host)-g++-posix"),) mingw32_CXX := $(host)-g++-posix endif