aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/install.sh2
-rwxr-xr-xscripts/make.sh3
2 files changed, 2 insertions, 3 deletions
diff --git a/scripts/install.sh b/scripts/install.sh
index 3d5b5a70..898bfada 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -115,7 +115,7 @@ if [ ! -z "$AIRLOCK" ]
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 7771cb77..9c22d4f4 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -13,8 +13,7 @@ UNSTRIPPED="generated/unstripped/$(basename "$OUTNAME")"
# 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