From 75cb84da6274d97fb7d146499b96b5a4973367cd 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: Sat, 5 Mar 2016 22:23:56 +0000 Subject: - Followup to last commit. - Replaced -[LI]${PREFIX_LVL3}/{lib,include} w/ --sysroot ${PREFIX_LVL3}. --- build.subr | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'build.subr') diff --git a/build.subr b/build.subr index 0da55070..8e6b1977 100644 --- a/build.subr +++ b/build.subr @@ -46,8 +46,11 @@ clean_build_status() { set -- BUILD_STATUS_IN_PROGRESS_FNAME BUILD_STATUS_PROGRESS_FNAME BUILD_STATUS_TARBALL_PROGRESS_FNAME; while [ ${#} -gt 0 ]; do rm -f $(get_var_unsafe ${1}); shift; - done; touch ${PREFIX}/BUILD_ABORTED_AT_$(date %Y-%m-%d-%H-%M-%S); - log_msg fail "Build aborted at $(date %Y-%m-%d-%H-%M-%S)."; + done; + if [ "${1}" = abort ]; then + touch ${PREFIX}/BUILD_ABORTED_AT_$(date %Y-%m-%d-%H-%M-%S); + log_msg fail "Build aborted at $(date %Y-%m-%d-%H-%M-%S)."; + fi; }; export_vars_subst() { @@ -60,8 +63,8 @@ export_vars_subst() { }; fetch_git() { - [ ${ARG_NO_DOWNLOAD:-0} -eq 0 ] &&\ - rm_if_exists ${1}; + [ ${ARG_NO_DOWNLOAD:-0} -eq 1 ] && return; + rm_if_exists ${1}; [ -d ${1} ] && (cd ${1} && git pull origin main)\ || git clone ${3} ${2} ${1}; }; @@ -171,8 +174,8 @@ clear_env_with_except() { }; fetch() { - [ ${ARG_NO_DOWNLOAD:-0} -eq 0 ] &&\ - rm_if_exists $(get_basename ${1}); + [ ${ARG_NO_DOWNLOAD:-0} -eq 1 ] && return; + rm_if_exists $(get_basename ${1}); wget ${WGET_ARGS} ${1}; if [ ${#} -eq 2 ]; then set -- $(get_basename ${1}) "$(compare_hash $(get_basename ${1}) ${2})" ${2}; -- cgit v1.2.3