From 981a63738ae634913c88920275828210779a9a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Tue, 21 Nov 2017 15:07:53 +0000 Subject: vars/build.vars: wake up disabled packages. vars/env.vars: fix ${DEFAULT_BUILD_CPUS} reference. vars/{gcc,libfirm,psxstub}.vars: fix ${PKG_MAKEFLAGS_BUILD} reference. vars/git.vars:pkg_git_install_post(): process files in destdir. subr/pkg_install_libs.subr:pkgp_install_lib_link(): ln(1) w/ target's basename. subr/pkg_install_libs.subr:pkg_install_libs(): sanity-check filenames. subr/pkg_setup_env.subr:pkg_setup_env(): rm(1) ${PKG_BASE_DIR} during -r. etc/build.usage: updated. --- subr/pkg_setup_env.subr | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'subr/pkg_setup_env.subr') diff --git a/subr/pkg_setup_env.subr b/subr/pkg_setup_env.subr index 6f2ef2cb..a02b1a60 100644 --- a/subr/pkg_setup_env.subr +++ b/subr/pkg_setup_env.subr @@ -16,7 +16,14 @@ pkg_setup_env() { [ -n "${PKG_ENV_VARS_EXTRA}" ] && set_env_vars_with_sep : "${PKG_ENV_VARS_EXTRA}"; [ -z "${PKG_FNAME}" ] && PKG_FNAME="${PKG_URL##*/}"; [ -z "${PKG_TARGET}" ] && PKG_TARGET="${TARGET}"; - [ -z "${PKG_BASE_DIR}" ] && PKG_BASE_DIR="${WORKDIR}/${PKG_NAME}-${PKG_BUILD_TYPE:-native}-${PKG_TARGET}"; + case "${PKG_BASE_DIR}" in + ?*) ;; + *) PKG_BASE_DIR="${WORKDIR}/${PKG_NAME}-${PKG_BUILD_TYPE:-native}-${PKG_TARGET}"; + if [ -n "${ARG_RESTART}" ]\ + && [ -z "${ARG_RESTART_AT}" ]; then + build_fileop rm "${PKG_BASE_DIR}"; + fi; ;; + esac; case "${PKG_BUILD_TYPE}" in host) export AR="ar"; export CC="gcc"; -- cgit v1.2.3