1.1 --- a/scripts/crosstool-NG.sh.in	Sun Apr 11 11:10:06 2010 +0200
     1.2 +++ b/scripts/crosstool-NG.sh.in	Sun Apr 11 15:37:53 2010 +0200
     1.3 @@ -239,6 +239,7 @@
     1.4  CT_DoExecLog ALL mkdir -p "${CT_CONFIG_DIR}"
     1.5  CT_DoExecLog ALL mkdir -p "${CT_INSTALL_DIR}"
     1.6  CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}"
     1.7 +CT_DoExecLog ALL mkdir -p "${CT_COMPLIBS_DIR}"
     1.8  if [ -z "${CT_CANADIAN}" ]; then
     1.9      CT_DoExecLog ALL mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}"
    1.10      CT_DoExecLog ALL mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}"

     2.1 --- a/scripts/functions	Sun Apr 11 11:10:06 2010 +0200
     2.2 +++ b/scripts/functions	Sun Apr 11 15:37:53 2010 +0200
     2.3 @@ -934,6 +934,13 @@
     2.4                             /^(UID|EUID)=/d;
     2.5                             /^(FUNCNAME|GROUPS|PPID|SHELLOPTS)=/d;' >"${state_dir}/env.sh"
     2.6  
     2.7 +    if [ "${CT_COMPLIBS_SHARED}" != "y" ]; then
     2.8 +        CT_DoLog DEBUG "  Saving CT_COMPLIBS_DIR='${CT_COMPLIBS_DIR}'"
     2.9 +        CT_Pushd "${CT_COMPLIBS_DIR}"
    2.10 +        CT_DoExecLog DEBUG tar cv${tar_opt}f "${state_dir}/complibs_dir.tar${tar_ext}" .
    2.11 +        CT_Popd
    2.12 +    fi
    2.13 +
    2.14      CT_DoLog DEBUG "  Saving CT_CONFIG_DIR='${CT_CONFIG_DIR}'"
    2.15      CT_Pushd "${CT_CONFIG_DIR}"
    2.16      CT_DoExecLog DEBUG tar cv${tar_opt}f "${state_dir}/config_dir.tar${tar_ext}" .
    2.17 @@ -1012,6 +1019,13 @@
    2.18      CT_DoExecLog DEBUG tar xv${tar_opt}f "${state_dir}/config_dir.tar${tar_ext}"
    2.19      CT_Popd
    2.20  
    2.21 +    if [ "${CT_COMPLIBS_SHARED}" != "y" ]; then
    2.22 +        CT_DoLog DEBUG "  Restoring CT_COMPLIBS_DIR='${CT_COMPLIBS_DIR}'"
    2.23 +        CT_Pushd "${CT_COMPLIBS_DIR}"
    2.24 +        CT_DoExecLog DEBUG tar xv${tar_opt}f "${state_dir}/complibs_dir.tar${tar_ext}"
    2.25 +        CT_Popd
    2.26 +    fi
    2.27 +
    2.28      # Restore the environment, discarding any error message
    2.29      # (for example, read-only bash internals)
    2.30      CT_DoLog DEBUG "  Restoring environment"