diff --git a/config/options b/config/options
index 7013860093..46ea9826a3 100644
--- a/config/options
+++ b/config/options
@@ -70,7 +70,7 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux $PROJECT_DIR/$PROJECT/patches/linux $
 
 # Need to point to your actual cc
 # If you have ccache installed, take care that LOCAL_CC don't point to it
-  [ -z "${LOCAL_CC}" ] && export LOCAL_CC="$(which gcc)"
+  [ -z "${LOCAL_CC}" ] && export LOCAL_CC="$(command -v gcc)"
 
 if [ -z "$LOCAL_CC" ] ; then
   echo "***** Please install gcc *****"
@@ -79,15 +79,15 @@ fi
 
 # Need to point to your actual g++
 # If you have ccache installed, take care that LOCAL_CXX don't point to it
-  [ -z "${LOCAL_CXX}" ] && export LOCAL_CXX="$(which g++)"
+  [ -z "${LOCAL_CXX}" ] && export LOCAL_CXX="$(command -v g++)"
 
 # verbose compilation mode (yes/no)
   VERBOSE="${VERBOSE:-yes}"
 
 # Concurrency make level (-j option)
-#  Try value 1 (default) to 4 on single CPU computer, or more on
-#  multi-processor computer (like hyperthreading SMP CPU)
-  [ -z "${CONCURRENCY_MAKE_LEVEL}" ] && export CONCURRENCY_MAKE_LEVEL=$(grep -c '^processor[[:cntrl:]]*:' /proc/cpuinfo)
+#  Try values between 1 and number of processor cores present.
+#  default: use all cores
+  [ -z "${CONCURRENCY_MAKE_LEVEL}" ] && export CONCURRENCY_MAKE_LEVEL=$(nproc)
 
 # cache size for ccache
 # Set the maximum size of the files stored in the cache. You can specify a