scripts/functions
changeset 2130 b46ecc90d3ab
parent 2096 5f01a23be1e4
child 2154 250cdcc86441
     1.1 --- a/scripts/functions	Thu Aug 26 23:36:54 2010 +0200
     1.2 +++ b/scripts/functions	Sun Oct 03 23:10:46 2010 +0200
     1.3 @@ -1017,9 +1017,7 @@
     1.4                             /^(UID|EUID)=/d;
     1.5                             /^(FUNCNAME|GROUPS|PPID|SHELLOPTS)=/d;' >"${state_dir}/env.sh"
     1.6  
     1.7 -    if [ "${CT_COMPLIBS_SHARED}" != "y" ]; then
     1.8 -        # If complibs are not shared, then COMPLIBS_DIR == PREFIX_DIR,
     1.9 -        # so do not save.
    1.10 +    if [ "${CT_COMPLIBS_BACKUP}" = "y" ]; then
    1.11          CT_DoTarballIfExists "${CT_COMPLIBS_DIR}" "${state_dir}/complibs_dir"
    1.12      fi
    1.13      CT_DoTarballIfExists "${CT_CONFIG_DIR}" "${state_dir}/config_dir"
    1.14 @@ -1060,9 +1058,7 @@
    1.15      CT_DoExtractTarballIfExists "${state_dir}/cc_core_shared_prefix_dir" "${CT_CC_CORE_SHARED_PREFIX_DIR}"
    1.16      CT_DoExtractTarballIfExists "${state_dir}/cc_core_static_prefix_dir" "${CT_CC_CORE_STATIC_PREFIX_DIR}"
    1.17      CT_DoExtractTarballIfExists "${state_dir}/config_dir" "${CT_CONFIG_DIR}"
    1.18 -    if [ "${CT_COMPLIBS_SHARED}" != "y" ]; then
    1.19 -        # If complibs are not shared, then COMPLIBS_DIR == PREFIX_DIR,
    1.20 -        # so do not restore.
    1.21 +    if [ "${CT_COMPLIBS_BACKUP}" = "y" ]; then
    1.22          CT_DoExtractTarballIfExists "${state_dir}/complibs_dir" "${CT_COMPLIBS_DIR}"
    1.23      fi
    1.24