# HG changeset patch # User "Yann E. MORIN" # Date 1270993073 -7200 # Node ID faea3afad5c0decf45e0cb7b67db89aae78b19f1 # Parent f5dab3c43abf19161cbf8984ab52e92a8b673711 complibs: save directory with static complibs for stop/restart diff -r f5dab3c43abf -r faea3afad5c0 scripts/crosstool-NG.sh.in --- a/scripts/crosstool-NG.sh.in Sun Apr 11 11:10:06 2010 +0200 +++ b/scripts/crosstool-NG.sh.in Sun Apr 11 15:37:53 2010 +0200 @@ -239,6 +239,7 @@ CT_DoExecLog ALL mkdir -p "${CT_CONFIG_DIR}" CT_DoExecLog ALL mkdir -p "${CT_INSTALL_DIR}" CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}" +CT_DoExecLog ALL mkdir -p "${CT_COMPLIBS_DIR}" if [ -z "${CT_CANADIAN}" ]; then CT_DoExecLog ALL mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}" CT_DoExecLog ALL mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}" diff -r f5dab3c43abf -r faea3afad5c0 scripts/functions --- a/scripts/functions Sun Apr 11 11:10:06 2010 +0200 +++ b/scripts/functions Sun Apr 11 15:37:53 2010 +0200 @@ -934,6 +934,13 @@ /^(UID|EUID)=/d; /^(FUNCNAME|GROUPS|PPID|SHELLOPTS)=/d;' >"${state_dir}/env.sh" + if [ "${CT_COMPLIBS_SHARED}" != "y" ]; then + CT_DoLog DEBUG " Saving CT_COMPLIBS_DIR='${CT_COMPLIBS_DIR}'" + CT_Pushd "${CT_COMPLIBS_DIR}" + CT_DoExecLog DEBUG tar cv${tar_opt}f "${state_dir}/complibs_dir.tar${tar_ext}" . + CT_Popd + fi + CT_DoLog DEBUG " Saving CT_CONFIG_DIR='${CT_CONFIG_DIR}'" CT_Pushd "${CT_CONFIG_DIR}" CT_DoExecLog DEBUG tar cv${tar_opt}f "${state_dir}/config_dir.tar${tar_ext}" . @@ -1012,6 +1019,13 @@ CT_DoExecLog DEBUG tar xv${tar_opt}f "${state_dir}/config_dir.tar${tar_ext}" CT_Popd + if [ "${CT_COMPLIBS_SHARED}" != "y" ]; then + CT_DoLog DEBUG " Restoring CT_COMPLIBS_DIR='${CT_COMPLIBS_DIR}'" + CT_Pushd "${CT_COMPLIBS_DIR}" + CT_DoExecLog DEBUG tar xv${tar_opt}f "${state_dir}/complibs_dir.tar${tar_ext}" + CT_Popd + fi + # Restore the environment, discarding any error message # (for example, read-only bash internals) CT_DoLog DEBUG " Restoring environment"