diff --git a/packages/aspell-en/build.sh b/packages/aspell-en/build.sh
index 2f2d59966..6c756ff1e 100644
--- a/packages/aspell-en/build.sh
+++ b/packages/aspell-en/build.sh
@@ -12,9 +12,9 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
 termux_step_configure() {
 	cat > $TERMUX_PKG_SRCDIR/Makefile <<- EOF
-	ASPELL = `which aspell`
+	ASPELL = `command -v aspell`
 	ASPELL_FLAGS = 
-	PREZIP = `which prezip`
+	PREZIP = `command -v prezip`
 	DESTDIR =
 	dictdir = $TERMUX_PREFIX/lib/aspell-0.60
 	datadir = $TERMUX_PREFIX/lib/aspell-0.60
diff --git a/packages/aspell-es/build.sh b/packages/aspell-es/build.sh
index 11137c679..70fc41fc2 100644
--- a/packages/aspell-es/build.sh
+++ b/packages/aspell-es/build.sh
@@ -12,9 +12,9 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
 termux_step_configure() {
 	cat > $TERMUX_PKG_SRCDIR/Makefile <<- EOF
-	ASPELL = `which aspell`
+	ASPELL = `command -v aspell`
 	ASPELL_FLAGS = 
-	PREZIP = `which prezip`
+	PREZIP = `command -v prezip`
 	DESTDIR =
 	dictdir = $TERMUX_PREFIX/lib/aspell-0.60
 	datadir = $TERMUX_PREFIX/lib/aspell-0.60
diff --git a/packages/aspell-fr/build.sh b/packages/aspell-fr/build.sh
index 398414a84..fa372aa99 100644
--- a/packages/aspell-fr/build.sh
+++ b/packages/aspell-fr/build.sh
@@ -11,9 +11,9 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
 termux_step_configure() {
 	cat > $TERMUX_PKG_SRCDIR/Makefile <<- EOF
-	ASPELL = `which aspell`
+	ASPELL = `command -v aspell`
 	ASPELL_FLAGS = 
-	PREZIP = `which prezip`
+	PREZIP = `command -v prezip`
 	DESTDIR =
 	dictdir = $TERMUX_PREFIX/lib/aspell-0.60
 	datadir = $TERMUX_PREFIX/lib/aspell-0.60
diff --git a/packages/ghc/build.sh b/packages/ghc/build.sh
index db9d52486..946f7570a 100644
--- a/packages/ghc/build.sh
+++ b/packages/ghc/build.sh
@@ -21,15 +21,15 @@ termux_step_pre_configure() {
 	mkdir -p $_WRAPPER_BIN
 	_WRAPPER_AR=$_WRAPPER_BIN/$TERMUX_HOST_PLATFORM-ar
 	cat > $_WRAPPER_AR <<-EOF
-		#!$(which sh)
-		exec $(which $AR) "\$@"
+		#!$(command -v sh)
+		exec $(command -v $AR) "\$@"
 	EOF
 	chmod 0700 $_WRAPPER_AR
 
 	for cmd in llc opt; do
 		local wrapper="$_WRAPPER_BIN/$cmd"
 		cat > "$wrapper" <<-EOF
-			#!$(which sh)
+			#!$(command -v sh)
 			exec /usr/lib/llvm-10/bin/${cmd} "\$@"
 		EOF
 		chmod 0700 "$wrapper"
diff --git a/packages/git/build.sh b/packages/git/build.sh
index 085d6cc13..8faaa47a0 100644
--- a/packages/git/build.sh
+++ b/packages/git/build.sh
@@ -50,7 +50,7 @@ termux_step_pre_configure() {
 
 	# Setup perl so that the build process can execute it:
 	rm -f $TERMUX_PREFIX/bin/perl
-	ln -s $(which perl) $TERMUX_PREFIX/bin/perl
+	ln -s $(command -v perl) $TERMUX_PREFIX/bin/perl
 
 	# Force fresh perl files (otherwise files from earlier builds
 	# remains without bumped modification times, so are not picked
diff --git a/packages/gnucobol/build.sh b/packages/gnucobol/build.sh
index f33fcbead..299cebc5d 100644
--- a/packages/gnucobol/build.sh
+++ b/packages/gnucobol/build.sh
@@ -19,7 +19,7 @@ termux_step_pre_configure() {
 	export COB_HAS_64_BIT_POINTER="${lp64}"
 
 	local bin="$TERMUX_PKG_BUILDDIR/bin"
-	local sh="$(which sh)"
+	local sh="$(command -v sh)"
 	mkdir -p "$bin"
 	for p in xml2; do
 		local conf="$bin/${p}-config"
diff --git a/packages/grafana/build.sh b/packages/grafana/build.sh
index 92650820e..3bf05d60e 100644
--- a/packages/grafana/build.sh
+++ b/packages/grafana/build.sh
@@ -16,7 +16,7 @@ termux_step_pre_configure() {
 	mv build $bin/_build
 	local goexec=$bin/go_$(go env GOOS)_$(go env GOARCH)_exec
 	cat > $goexec <<-EOF
-		#!$(which sh)
+		#!$(command -v sh)
 		shift
 		exec $bin/_build -goos=$GOOS -goarch=$GOARCH "\$@"
 		EOF
@@ -24,7 +24,7 @@ termux_step_pre_configure() {
 
 	local yarn=$bin/yarn
 	cat > $yarn <<-EOF
-		#!$(which sh)
+		#!$(command -v sh)
 		exec sh $TERMUX_PREFIX/bin/yarn "\$@"
 		EOF
 	chmod 0755 $yarn
diff --git a/packages/keystone/build.sh b/packages/keystone/build.sh
index f9c4e6f9b..eded7251f 100644
--- a/packages/keystone/build.sh
+++ b/packages/keystone/build.sh
@@ -12,5 +12,5 @@ TERMUX_PKG_BREAKS="keystone-dev"
 TERMUX_PKG_REPLACES="keystone-dev"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--DPYTHON_EXECUTABLE=$(which python2.7)
+-DPYTHON_EXECUTABLE=$(command -v python2.7)
 -DBUILD_SHARED_LIBS=ON"
diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh
index 755d64582..13c111cca 100644
--- a/packages/ldc/build.sh
+++ b/packages/ldc/build.sh
@@ -42,7 +42,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DLLVM_INCLUDE_TESTS=OFF
 -DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen
 -DLLVM_CONFIG_PATH=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-config
--DPYTHON_EXECUTABLE=$(which python3)
+-DPYTHON_EXECUTABLE=$(command -v python3)
 -DLLVM_TARGETS_TO_BUILD='AArch64;ARM;WebAssembly;X86'
 -DCMAKE_INSTALL_PREFIX=$LLVM_INSTALL_DIR
 "
diff --git a/packages/libcue/build.sh b/packages/libcue/build.sh
index abbb0c9dc..48fd149a6 100644
--- a/packages/libcue/build.sh
+++ b/packages/libcue/build.sh
@@ -11,7 +11,7 @@ TERMUX_PKG_BREAKS="libcue-dev"
 TERMUX_PKG_REPLACES="libcue-dev"
 # To avoid picking up cross-compiled flex and bison:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--DBISON_EXECUTABLE=$(which bison)
--DFLEX_EXECUTABLE=$(which flex)
+-DBISON_EXECUTABLE=$(command -v bison)
+-DFLEX_EXECUTABLE=$(command -v flex)
 -DBUILD_SHARED_LIBS=ON
 "
diff --git a/packages/libgnustep-base/build.sh b/packages/libgnustep-base/build.sh
index 065cbefcb..66b4acbcc 100644
--- a/packages/libgnustep-base/build.sh
+++ b/packages/libgnustep-base/build.sh
@@ -39,14 +39,14 @@ ac_cv_func_setpgrp_void=yes
 termux_step_pre_configure() {
 	local bin="$TERMUX_PKG_BUILDDIR/bin"
 	mkdir -p "$bin"
-	local sh="$(which sh)"
+	local sh="$(command -v sh)"
 	for cmd in CPP CC CXX; do
 		local wrapper="$bin/$(basename $(eval echo \${$cmd}))"
 		cat > "$wrapper" <<-EOF
 			#!${sh}
 			unset LD_PRELOAD
 			unset LD_LIBRARY_PATH
-			exec $(which $(eval echo \${$cmd})) "\$@"
+			exec $(command -v $(eval echo \${$cmd})) "\$@"
 		EOF
 		chmod 0700 "$wrapper"
 	done
diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh
index ffac092ea..fc3fd6065 100644
--- a/packages/libllvm/build.sh
+++ b/packages/libllvm/build.sh
@@ -21,7 +21,7 @@ TERMUX_PKG_REPLACES="gcc, libclang, libclang-dev, libllvm-dev"
 TERMUX_PKG_GROUPS="base-devel"
 # See http://llvm.org/docs/CMake.html:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--DPYTHON_EXECUTABLE=$(which python3)
+-DPYTHON_EXECUTABLE=$(command -v python3)
 -DLLVM_ENABLE_PIC=ON
 -DLLVM_ENABLE_PROJECTS=clang;clang-tools-extra;compiler-rt;lld;lldb;openmp;polly
 -DLLVM_ENABLE_LIBEDIT=OFF
@@ -43,7 +43,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DSPHINX_WARNINGS_AS_ERRORS=OFF
 -DLLVM_TARGETS_TO_BUILD=all
 -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=AVR;RISCV
--DPERL_EXECUTABLE=$(which perl)
+-DPERL_EXECUTABLE=$(command -v perl)
 -DLLVM_ENABLE_FFI=ON
 "
 
diff --git a/packages/libraptor2/build.sh b/packages/libraptor2/build.sh
index 832f30701..e7c4a7716 100644
--- a/packages/libraptor2/build.sh
+++ b/packages/libraptor2/build.sh
@@ -15,7 +15,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 
 termux_step_pre_configure() {
 	local bin="$TERMUX_PKG_BUILDDIR/bin"
-	local sh="$(which sh)"
+	local sh="$(command -v sh)"
 	mkdir -p "$bin"
 	for p in curl icu xml2 xslt; do
 		local conf="$bin/${p}-config"
diff --git a/packages/librasqal/build.sh b/packages/librasqal/build.sh
index b2eab9944..394dde6c5 100644
--- a/packages/librasqal/build.sh
+++ b/packages/librasqal/build.sh
@@ -11,7 +11,7 @@ TERMUX_PKG_BUILD_DEPENDS="libxml2"
 
 termux_step_pre_configure() {
 	local bin="$TERMUX_PKG_BUILDDIR/bin"
-	local sh="$(which sh)"
+	local sh="$(command -v sh)"
 	mkdir -p "$bin"
 	for p in pcre xml2; do
 		local conf="$bin/${p}-config"
diff --git a/packages/librsync/build.sh b/packages/librsync/build.sh
index 70f67e441..9695e6c04 100644
--- a/packages/librsync/build.sh
+++ b/packages/librsync/build.sh
@@ -11,4 +11,4 @@ TERMUX_PKG_DEPENDS="libbz2"
 TERMUX_PKG_BUILD_DEPENDS="libpopt"
 TERMUX_PKG_BREAKS="librsync-dev"
 TERMUX_PKG_REPLACES="librsync-dev"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DPERL_EXECUTABLE=$(which perl)"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DPERL_EXECUTABLE=$(command -v perl)"
diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh
index 67ecabe74..faedb96aa 100644
--- a/packages/mariadb/build.sh
+++ b/packages/mariadb/build.sh
@@ -12,11 +12,11 @@ TERMUX_PKG_REPLACES="mariadb-dev"
 TERMUX_PKG_SERVICE_SCRIPT=("mysqld" "exec mysqld --basedir=$TERMUX_PREFIX --datadir=$TERMUX_PREFIX/var/lib/mysql 2>&1")
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--DBISON_EXECUTABLE=$(which bison)
--DGETCONF=$(which getconf)
+-DBISON_EXECUTABLE=$(command -v bison)
+-DGETCONF=$(command -v getconf)
 -DBUILD_CONFIG=mysql_release
--DCAT_EXECUTABLE=$(which cat)
--DGIT_EXECUTABLE=$(which git)
+-DCAT_EXECUTABLE=$(command -v cat)
+-DGIT_EXECUTABLE=$(command -v git)
 -DGSSAPI_FOUND=NO
 -DGRN_WITH_LZ4=yes
 -DENABLED_LOCAL_INFILE=ON
diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index ebb68fd9d..5a69dfde1 100644
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -12,12 +12,12 @@ TERMUX_PKG_HOSTBUILD=true
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DENABLE_JEMALLOC=OFF
--DGETTEXT_MSGFMT_EXECUTABLE=$(which msgfmt)
--DGETTEXT_MSGMERGE_EXECUTABLE=$(which msgmerge)
+-DGETTEXT_MSGFMT_EXECUTABLE=$(command -v msgfmt)
+-DGETTEXT_MSGMERGE_EXECUTABLE=$(command -v msgmerge)
 -DGPERF_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/gperf
 -DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit
--DPKG_CONFIG_EXECUTABLE=$(which pkg-config)
--DXGETTEXT_PRG=$(which xgettext)
+-DPKG_CONFIG_EXECUTABLE=$(command -v pkg-config)
+-DXGETTEXT_PRG=$(command -v xgettext)
 -DLUAJIT_INCLUDE_DIR=$TERMUX_PREFIX/include/luajit-2.1
 "
 TERMUX_PKG_CONFFILES="share/nvim/sysinit.vim"
@@ -32,7 +32,7 @@ _patch_luv() {
 termux_step_host_build() {
 	termux_setup_cmake
 
-	TERMUX_ORIGINAL_CMAKE=$(which cmake)
+	TERMUX_ORIGINAL_CMAKE=$(command -v cmake)
 	if [ ! -f "$TERMUX_ORIGINAL_CMAKE.orig" ]; then
 		mv "$TERMUX_ORIGINAL_CMAKE" "$TERMUX_ORIGINAL_CMAKE.orig"
 	fi
diff --git a/packages/rust/build.sh b/packages/rust/build.sh
index 6acb859c5..3e04371ce 100644
--- a/packages/rust/build.sh
+++ b/packages/rust/build.sh
@@ -23,8 +23,8 @@ termux_step_configure() {
 	rustup install $BOOTSTRAP_VERSION
 	rustup default $BOOTSTRAP_VERSION-x86_64-unknown-linux-gnu
 	export PATH=$HOME/.rustup/toolchains/$BOOTSTRAP_VERSION-x86_64-unknown-linux-gnu/bin:$PATH
-	local RUSTC=$(which rustc)
-	local CARGO=$(which cargo)
+	local RUSTC=$(command -v rustc)
+	local CARGO=$(command -v cargo)
 
 	sed "s%\\@TERMUX_PREFIX\\@%$TERMUX_PREFIX%g" \
 		$TERMUX_PKG_BUILDER_DIR/config.toml \
diff --git a/packages/serf/build.sh b/packages/serf/build.sh
index 88491bb1d..6262d30bf 100644
--- a/packages/serf/build.sh
+++ b/packages/serf/build.sh
@@ -14,7 +14,7 @@ TERMUX_PKG_BUILD_IN_SRC=true
 termux_step_make_install() {
 	scons APR=$TERMUX_PREFIX \
 	      APU=$TERMUX_PREFIX \
-	      CC=$(which $CC) \
+	      CC=$(command -v $CC) \
 	      CFLAGS="$CFLAGS" \
 	      CPPFLAGS="$CPPFLAGS -std=c11" \
 	      LINKFLAGS="$LDFLAGS" \
diff --git a/packages/weechat/build.sh b/packages/weechat/build.sh
index 5f45e2732..c22214715 100644
--- a/packages/weechat/build.sh
+++ b/packages/weechat/build.sh
@@ -30,9 +30,9 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DENABLE_SPELL=OFF
 -DENABLE_TESTS=OFF
 -DSTRICT=ON
--DMSGFMT_EXECUTABLE=$(which msgfmt)
--DMSGMERGE_EXECUTABLE=$(which msgmerge)
--DXGETTEXT_EXECUTABLE=$(which xgettext)
+-DMSGFMT_EXECUTABLE=$(command -v msgfmt)
+-DMSGMERGE_EXECUTABLE=$(command -v msgmerge)
+-DXGETTEXT_EXECUTABLE=$(command -v xgettext)
 "
 
 termux_step_pre_configure() {
diff --git a/packages/zig/build.sh b/packages/zig/build.sh
index d2b900a8a..f022eae8d 100644
--- a/packages/zig/build.sh
+++ b/packages/zig/build.sh
@@ -16,7 +16,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 termux_step_pre_configure() {
 	termux_setup_zig
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="
-		-DZIG_EXECUTABLE=$(which zig)
+		-DZIG_EXECUTABLE=$(command -v zig)
 		-DZIG_TARGET_TRIPLE=$ZIG_TARGET_NAME
 		"
 	LDFLAGS+=" -landroid-spawn -lncursesw -lxml2 -lz"