From b6e66a35742c702a15c87d2aa88ddc48d0039641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Fri, 14 Feb 2020 23:39:07 +0000 Subject: subr/build_init.subr:buildp_init_vars(): set ${DEFAULT_BUILD_CPUS} before sourcing vars. --- subr/build_init.subr | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/subr/build_init.subr b/subr/build_init.subr index 97db31eb..dc5ef1b2 100644 --- a/subr/build_init.subr +++ b/subr/build_init.subr @@ -67,13 +67,6 @@ buildp_init_clean_prefix() { buildp_init_env() { local _rc=0 _vname="" _vname_val=""; _status=""; - if [ -z "${DEFAULT_BUILD_CPUS}" ]; then - if [ -e /proc/cpuinfo ]; then - DEFAULT_BUILD_CPUS="$(awk '/^processor/{cpus++} END{print cpus}' /proc/cpuinfo)"; - else - DEFAULT_BUILD_CPUS=1; - fi; - fi; case "${ARG_PARALLEL}" in auto) if [ "${DEFAULT_BUILD_CPUS}" -gt 1 ]; then @@ -199,6 +192,13 @@ buildp_init_type() { buildp_init_vars() { local _fname="" _rc=0; _status=""; + if [ -z "${DEFAULT_BUILD_CPUS}" ]; then + if [ -e /proc/cpuinfo ]; then + DEFAULT_BUILD_CPUS="$(awk '/^processor/{cpus++} END{print cpus}' /proc/cpuinfo)"; + else + DEFAULT_BUILD_CPUS=1; + fi; + fi; for _fname in \ ${HOME}/midipix_build.vars \ ${HOME}/.midipix_build.vars \ -- cgit v1.2.3