1.1 --- a/scripts/functions	Fri Mar 27 21:30:47 2009 +0000
     1.2 +++ b/scripts/functions	Fri Mar 27 23:40:07 2009 +0000
     1.3 @@ -854,6 +854,11 @@
     1.4                             /^(UID|EUID)=/d;
     1.5                             /^(FUNCNAME|GROUPS|PPID|SHELLOPTS)=/d;' >"${state_dir}/env.sh"
     1.6  
     1.7 +    CT_DoLog DEBUG "  Saving CT_CONFIG_DIR='${CT_CONFIG_DIR}'"
     1.8 +    CT_Pushd "${CT_CONFIG_DIR}"
     1.9 +    CT_DoExecLog DEBUG tar cv${tar_opt}f "${state_dir}/config_dir.tar${tar_ext}" .
    1.10 +    CT_Popd
    1.11 +
    1.12      CT_DoLog DEBUG "  Saving CT_CC_CORE_STATIC_PREFIX_DIR='${CT_CC_CORE_STATIC_PREFIX_DIR}'"
    1.13      CT_Pushd "${CT_CC_CORE_STATIC_PREFIX_DIR}"
    1.14      CT_DoExecLog DEBUG tar cv${tar_opt}f "${state_dir}/cc_core_static_prefix_dir.tar${tar_ext}" .
    1.15 @@ -904,9 +909,8 @@
    1.16      esac
    1.17  
    1.18      CT_DoLog DEBUG "  Removing previous build directories"
    1.19 -    chmod -R u+rwX "${CT_PREFIX_DIR}" "${CT_CC_CORE_SHARED_PREFIX_DIR}" "${CT_CC_CORE_STATIC_PREFIX_DIR}"
    1.20 -    rm -rf         "${CT_PREFIX_DIR}" "${CT_CC_CORE_SHARED_PREFIX_DIR}" "${CT_CC_CORE_STATIC_PREFIX_DIR}"
    1.21 -    mkdir -p       "${CT_PREFIX_DIR}" "${CT_CC_CORE_SHARED_PREFIX_DIR}" "${CT_CC_CORE_STATIC_PREFIX_DIR}"
    1.22 +    CT_DoForceRmdir             "${CT_PREFIX_DIR}" "${CT_CC_CORE_SHARED_PREFIX_DIR}" "${CT_CC_CORE_STATIC_PREFIX_DIR}" "${CT_CONFIG_DIR}"
    1.23 +    CT_DoExecLog DEBUG mkdir -p "${CT_PREFIX_DIR}" "${CT_CC_CORE_SHARED_PREFIX_DIR}" "${CT_CC_CORE_STATIC_PREFIX_DIR}" "${CT_CONFIG_DIR}"
    1.24  
    1.25      CT_DoLog DEBUG "  Restoring CT_PREFIX_DIR='${CT_PREFIX_DIR}'"
    1.26      CT_Pushd "${CT_PREFIX_DIR}"
    1.27 @@ -923,6 +927,11 @@
    1.28      CT_DoExecLog DEBUG tar xv${tar_opt}f "${state_dir}/cc_core_static_prefix_dir.tar${tar_ext}"
    1.29      CT_Popd
    1.30  
    1.31 +    CT_DoLog DEBUG "  Restoring CT_CONFIG_DIR='${CT_CONFIG_DIR}'"
    1.32 +    CT_Pushd "${CT_CONFIG_DIR}"
    1.33 +    CT_DoExecLog DEBUG tar xv${tar_opt}f "${state_dir}/config_dir.tar${tar_ext}"
    1.34 +    CT_Popd
    1.35 +
    1.36      # Restore the environment, discarding any error message
    1.37      # (for example, read-only bash internals)
    1.38      CT_DoLog DEBUG "  Restoring environment"