diff --git a/em++ b/em++
index adf1caa3af53d..00851011f7692 100755
--- a/em++
+++ b/em++
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/em-config b/em-config
index 232f947841a40..8464d365b479d 100755
--- a/em-config
+++ b/em-config
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/emar b/emar
index 232f947841a40..8464d365b479d 100755
--- a/emar
+++ b/emar
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/embuilder b/embuilder
index 232f947841a40..8464d365b479d 100755
--- a/embuilder
+++ b/embuilder
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/emcc b/emcc
index adf1caa3af53d..00851011f7692 100755
--- a/emcc
+++ b/emcc
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/emcmake b/emcmake
index 232f947841a40..8464d365b479d 100755
--- a/emcmake
+++ b/emcmake
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/emconfigure b/emconfigure
index 232f947841a40..8464d365b479d 100755
--- a/emconfigure
+++ b/emconfigure
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/emdump b/emdump
index 743fe03255675..4f6cfc2c25c65 100755
--- a/emdump
+++ b/emdump
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/emdwp b/emdwp
index 727b147d32232..60f190e779aa4 100755
--- a/emdwp
+++ b/emdwp
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/emmake b/emmake
index 232f947841a40..8464d365b479d 100755
--- a/emmake
+++ b/emmake
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/emnm b/emnm
index e662d746e7839..d160da3e6492a 100755
--- a/emnm
+++ b/emnm
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/emprofile b/emprofile
index 6a0cbc717dfb5..16678aaf9dedb 100755
--- a/emprofile
+++ b/emprofile
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/emranlib b/emranlib
index 232f947841a40..8464d365b479d 100755
--- a/emranlib
+++ b/emranlib
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/emrun b/emrun
index 232f947841a40..8464d365b479d 100755
--- a/emrun
+++ b/emrun
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/emscons b/emscons
index 232f947841a40..8464d365b479d 100755
--- a/emscons
+++ b/emscons
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/emsize b/emsize
index 232f947841a40..8464d365b479d 100755
--- a/emsize
+++ b/emsize
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/tests/runner b/tests/runner
index 232f947841a40..8464d365b479d 100755
--- a/tests/runner
+++ b/tests/runner
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/tools/file_packager b/tools/file_packager
index 232f947841a40..8464d365b479d 100755
--- a/tools/file_packager
+++ b/tools/file_packager
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/tools/run_python.sh b/tools/run_python.sh
index 232f947841a40..8464d365b479d 100755
--- a/tools/run_python.sh
+++ b/tools/run_python.sh
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/tools/run_python_compiler.sh b/tools/run_python_compiler.sh
index adf1caa3af53d..00851011f7692 100644
--- a/tools/run_python_compiler.sh
+++ b/tools/run_python_compiler.sh
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
diff --git a/tools/webidl_binder b/tools/webidl_binder
index 232f947841a40..8464d365b479d 100755
--- a/tools/webidl_binder
+++ b/tools/webidl_binder
@@ -16,11 +16,11 @@ if [ -z "$PYTHON" ]; then
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python3 2> /dev/null)
+  PYTHON=$(command -v python3 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then
-  PYTHON=$(which python 2> /dev/null)
+  PYTHON=$(command -v python 2> /dev/null)
 fi
 
 if [ -z "$PYTHON" ]; then