diff --git a/scripts/install.sh b/scripts/install.sh
index 3d5b5a7..898bfad 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -115,7 +115,7 @@
 then
 
   # Tools needed to build packages
-  for i in ar as nm cc make ld gcc objdump $PENDING $HOST_EXTRA
+  for i in $TOOLCHAIN $PENDING $HOST_EXTRA
   do
     if [ ! -f "$i" ]
   then
diff --git a/scripts/make.sh b/scripts/make.sh
index 7771cb7..9c22d4f 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -13,8 +13,7 @@
 
 # Since each cc invocation is short, launch half again as many processes
 # as we have processors so they don't exit faster than we can start them.
-[ -z "$CPUS" ] &&
-  CPUS=$((($(echo /sys/devices/system/cpu/cpu[0-9]* | wc -w)*3)/2))
+[ -z "$CPUS" ] && CPUS=$(($(nproc)+1))
 
 if [ -z "$SED" ]
 then