1.1 --- a/scripts/crosstool.sh Tue Jun 17 11:30:36 2008 +0000
1.2 +++ b/scripts/crosstool.sh Fri Jun 27 11:18:56 2008 +0000
1.3 @@ -86,15 +86,16 @@
1.4 CT_LIBC_FILE="${CT_LIBC}-${CT_LIBC_VERSION}"
1.5
1.6 # Where will we work?
1.7 -CT_TARBALLS_DIR="${CT_TOP_DIR}/targets/tarballs"
1.8 -CT_SRC_DIR="${CT_TOP_DIR}/targets/src"
1.9 -CT_BUILD_DIR="${CT_TOP_DIR}/targets/${CT_TARGET}/build"
1.10 +: "${CT_WORK_DIR:=${CT_TOP_DIR}/targets}"
1.11 +CT_TARBALLS_DIR="${CT_WORK_DIR}/tarballs"
1.12 +CT_SRC_DIR="${CT_WORK_DIR}/src"
1.13 +CT_BUILD_DIR="${CT_WORK_DIR}/${CT_TARGET}/build"
1.14 CT_DEBUG_INSTALL_DIR="${CT_INSTALL_DIR}/${CT_TARGET}/debug-root"
1.15 # Note: we'll always install the core compiler in its own directory, so as to
1.16 # not mix the two builds: core and final.
1.17 CT_CC_CORE_STATIC_PREFIX_DIR="${CT_BUILD_DIR}/${CT_CC}-core-static"
1.18 CT_CC_CORE_SHARED_PREFIX_DIR="${CT_BUILD_DIR}/${CT_CC}-core-shared"
1.19 -CT_STATE_DIR="${CT_TOP_DIR}/targets/${CT_TARGET}/state"
1.20 +CT_STATE_DIR="${CT_WORK_DIR}/${CT_TARGET}/state"
1.21
1.22 # We must ensure that we can restart if asked for!
1.23 if [ -n "${CT_RESTART}" -a ! -d "${CT_STATE_DIR}" ]; then