diff -r 5f01a23be1e4 -r b46ecc90d3ab scripts/functions
--- a/scripts/functions	Thu Aug 26 23:36:54 2010 +0200
+++ b/scripts/functions	Sun Oct 03 23:10:46 2010 +0200
@@ -1017,9 +1017,7 @@
                            /^(UID|EUID)=/d;
                            /^(FUNCNAME|GROUPS|PPID|SHELLOPTS)=/d;' >"${state_dir}/env.sh"
 
-    if [ "${CT_COMPLIBS_SHARED}" != "y" ]; then
-        # If complibs are not shared, then COMPLIBS_DIR == PREFIX_DIR,
-        # so do not save.
+    if [ "${CT_COMPLIBS_BACKUP}" = "y" ]; then
         CT_DoTarballIfExists "${CT_COMPLIBS_DIR}" "${state_dir}/complibs_dir"
     fi
     CT_DoTarballIfExists "${CT_CONFIG_DIR}" "${state_dir}/config_dir"
@@ -1060,9 +1058,7 @@
     CT_DoExtractTarballIfExists "${state_dir}/cc_core_shared_prefix_dir" "${CT_CC_CORE_SHARED_PREFIX_DIR}"
     CT_DoExtractTarballIfExists "${state_dir}/cc_core_static_prefix_dir" "${CT_CC_CORE_STATIC_PREFIX_DIR}"
     CT_DoExtractTarballIfExists "${state_dir}/config_dir" "${CT_CONFIG_DIR}"
-    if [ "${CT_COMPLIBS_SHARED}" != "y" ]; then
-        # If complibs are not shared, then COMPLIBS_DIR == PREFIX_DIR,
-        # so do not restore.
+    if [ "${CT_COMPLIBS_BACKUP}" = "y" ]; then
         CT_DoExtractTarballIfExists "${state_dir}/complibs_dir" "${CT_COMPLIBS_DIR}"
     fi