diff -r d1d192887a15 -r ddac62e7c428 scripts/crosstool-NG.sh.in
--- a/scripts/crosstool-NG.sh.in	Fri Mar 27 18:53:54 2009 +0000
+++ b/scripts/crosstool-NG.sh.in	Fri Mar 27 23:40:07 2009 +0000
@@ -114,11 +114,13 @@
 CT_TARBALLS_DIR="${CT_WORK_DIR}/tarballs"
 CT_SRC_DIR="${CT_WORK_DIR}/src"
 CT_BUILD_DIR="${CT_WORK_DIR}/${CT_TARGET}/build"
+CT_STATE_DIR="${CT_WORK_DIR}/${CT_TARGET}/state"
+CT_CONFIG_DIR="${CT_BUILD_DIR}/configs"
+
 # Note: we'll always install the core compiler in its own directory, so as to
 # not mix the two builds: core and final.
 CT_CC_CORE_STATIC_PREFIX_DIR="${CT_BUILD_DIR}/${CT_CC}-core-static"
 CT_CC_CORE_SHARED_PREFIX_DIR="${CT_BUILD_DIR}/${CT_CC}-core-shared"
-CT_STATE_DIR="${CT_WORK_DIR}/${CT_TARGET}/state"
 
 # We must ensure that we can restart if asked for!
 if [ -n "${CT_RESTART}" -a ! -d "${CT_STATE_DIR}"  ]; then
@@ -194,11 +196,14 @@
 CT_DoExecLog ALL mkdir -p "${CT_TARBALLS_DIR}"
 CT_DoExecLog ALL mkdir -p "${CT_SRC_DIR}"
 CT_DoExecLog ALL mkdir -p "${CT_BUILD_DIR}"
+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_CC_CORE_STATIC_PREFIX_DIR}"
 CT_DoExecLog ALL mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}"
-CT_DoExecLog ALL mkdir -p "${CT_STATE_DIR}"
+
+# Only create the state dir if asked for a restartable build
+[ -n "${CT_DEBUG_CT_SAVE_STEPS}" ] && CT_DoExecLog ALL mkdir -p "${CT_STATE_DIR}"
 
 # Check install file system case-sensitiveness
 touch "${CT_PREFIX_DIR}/foo"