diff options
| -rwxr-xr-x | bin/ptxdist | 6 | ||||
| -rw-r--r-- | rules/boost.make | 2 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_world_common.sh | 2 | ||||
| -rw-r--r-- | scripts/libptxdist.sh | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 61037a4f8..137d76824 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -1305,10 +1305,10 @@ parse_first() PTXDIST_PARALLELMFLAGS_EXTERN="-j${arg#*e}" ;; -l*) - PTXDIST_LOADMFLAGS_INTERN="-l${arg#*l}" + PTXDIST_LOADMFLAGS="-l${arg#*l}" ;; --load-average=*) - PTXDIST_LOADMFLAGS_INTERN="-l${arg#*=}" + PTXDIST_LOADMFLAGS="-l${arg#*=}" ;; -n*) PTX_NICE="${arg#*n}" @@ -2610,7 +2610,7 @@ setup_export() { PTXDIST_PLATFORMCONFIGDIR \ \ PTXDIST_PARALLELMFLAGS_INTERN \ - PTXDIST_LOADMFLAGS_INTERN \ + PTXDIST_LOADMFLAGS \ \ PTXDIST_CCACHE \ PTXDIST_FORCE_DOWNLOAD \ diff --git a/rules/boost.make b/rules/boost.make index a0e52c4df..ecf6a4b06 100644 --- a/rules/boost.make +++ b/rules/boost.make @@ -62,7 +62,7 @@ BOOST_JAM := \ JAM_MAKE_OPT := \ $(if $(shell test $(subst -j,,$(PARALLELMFLAGS)) -le 64 && echo 1),$(PARALLELMFLAGS),-j64) \ - $(PTXDIST_LOADMFLAGS_INTERN) \ + $(PTXDIST_LOADMFLAGS) \ stage JAM_INSTALL_OPT := \ diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh index e8105fa62..4892270a9 100644 --- a/scripts/lib/ptxd_make_world_common.sh +++ b/scripts/lib/ptxd_make_world_common.sh @@ -342,7 +342,7 @@ ptxd_make_world_init() { # parallelmake # case "${pkg_make_par}" in - "YES"|"") pkg_make_par="${PTXDIST_PARALLELMFLAGS_INTERN} ${PTXDIST_LOADMFLAGS_INTERN}" ;; + "YES"|"") pkg_make_par="${PTXDIST_PARALLELMFLAGS_INTERN} ${PTXDIST_LOADMFLAGS}" ;; "NO") pkg_make_par=-j1 ;; *) ptxd_bailout "<PKG>_MAKE_PAR: please set to YES or NO" ;; esac diff --git a/scripts/libptxdist.sh b/scripts/libptxdist.sh index 5a5958caa..fa0fcb016 100644 --- a/scripts/libptxdist.sh +++ b/scripts/libptxdist.sh @@ -356,7 +356,7 @@ ptxd_make() { done done ${PTX_NICE:+nice -n ${PTX_NICE}} "${PTXCONF_SETUP_HOST_MAKE}" \ - "${PTX_MAKE_ARGS[@]}" "${PTXDIST_PARALLELMFLAGS_EXTERN}" \ + "${PTX_MAKE_ARGS[@]}" "${PTXDIST_PARALLELMFLAGS_EXTERN}" ${PTXDIST_LOADMFLAGS} \ -f "${RULESDIR}/other/Toplevel.make" "${@}" || return } |