1.1 --- a/scripts/crosstool-NG.sh.in	Sun Feb 01 18:51:19 2009 +0000
     1.2 +++ b/scripts/crosstool-NG.sh.in	Tue Mar 03 17:41:59 2009 +0000
     1.3 @@ -32,7 +32,7 @@
     1.4  CT_WORK_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/targets}"
     1.5  
     1.6  # Create the bin-overide early
     1.7 -# Contains symlinks to the tools found bu ./configure
     1.8 +# Contains symlinks to the tools found by ./configure
     1.9  # Note: CT_DoLog and CT_DoExecLog do not use any of those tool, so
    1.10  # they can be safely used
    1.11  CT_BIN_OVERIDE_DIR="${CT_WORK_DIR}/bin"
    1.12 @@ -108,7 +108,6 @@
    1.13  CT_TARBALLS_DIR="${CT_WORK_DIR}/tarballs"
    1.14  CT_SRC_DIR="${CT_WORK_DIR}/src"
    1.15  CT_BUILD_DIR="${CT_WORK_DIR}/${CT_TARGET}/build"
    1.16 -CT_DEBUG_INSTALL_DIR="${CT_INSTALL_DIR}/${CT_TARGET}/debug-root"
    1.17  # Note: we'll always install the core compiler in its own directory, so as to
    1.18  # not mix the two builds: core and final.
    1.19  CT_CC_CORE_STATIC_PREFIX_DIR="${CT_BUILD_DIR}/${CT_CC}-core-static"
    1.20 @@ -177,9 +176,6 @@
    1.21      if [ -d "${CT_INSTALL_DIR}" ]; then
    1.22          CT_DoForceRmdir "${CT_INSTALL_DIR}"
    1.23      fi
    1.24 -    if [ -d "${CT_DEBUG_INSTALL_DIR}" ]; then
    1.25 -        CT_DoForceRmdir "${CT_DEBUG_INSTALL_DIR}"
    1.26 -    fi
    1.27      # In case we start anew, get rid of the previously saved state directory
    1.28      if [ -d "${CT_STATE_DIR}" ]; then
    1.29          CT_DoForceRmdir "${CT_STATE_DIR}"
    1.30 @@ -194,7 +190,6 @@
    1.31  CT_DoExecLog ALL mkdir -p "${CT_BUILD_DIR}"
    1.32  CT_DoExecLog ALL mkdir -p "${CT_INSTALL_DIR}"
    1.33  CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}"
    1.34 -CT_DoExecLog ALL mkdir -p "${CT_DEBUG_INSTALL_DIR}"
    1.35  CT_DoExecLog ALL mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}"
    1.36  CT_DoExecLog ALL mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}"
    1.37  CT_DoExecLog ALL mkdir -p "${CT_STATE_DIR}"
    1.38 @@ -229,7 +224,8 @@
    1.39  
    1.40      # Arrange paths depending on wether we use sys-root or not.
    1.41      if [ "${CT_USE_SYSROOT}" = "y" ]; then
    1.42 -        CT_SYSROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/sys-root"
    1.43 +        CT_SYSROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/sys-root"
    1.44 +        CT_DEBUGROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/debug-root"
    1.45          CT_HEADERS_DIR="${CT_SYSROOT_DIR}/usr/include"
    1.46          BINUTILS_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}"
    1.47          CC_CORE_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}"
    1.48 @@ -253,6 +249,8 @@
    1.49          CC_SYSROOT_ARG="--with-headers=${CT_HEADERS_DIR}"
    1.50          LIBC_SYSROOT_ARG="prefix="
    1.51      fi
    1.52 +    CT_DoExecLog ALL mkdir -p "${CT_SYSROOT_DIR}"
    1.53 +    CT_DoExecLog ALL mkdir -p "${CT_DEBUGROOT_DIR}"
    1.54  
    1.55      # Prepare the 'lib' directories in sysroot, else the ../lib64 hack used by
    1.56      # 32 -> 64 bit crosscompilers won't work, and build of final gcc will fail
    1.57 @@ -264,7 +262,7 @@
    1.58      CT_DoExecLog ALL mkdir -p "${CT_SYSROOT_DIR}/usr/lib"
    1.59  
    1.60      # Prevent gcc from installing its libraries outside of the sys-root
    1.61 -    CT_DoExecLog ALL ln -sf "sys-root/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib"
    1.62 +    CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/sys-root/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib"
    1.63  
    1.64      # Now, in case we're 64 bits, just have lib64/ be a symlink to lib/
    1.65      # so as to have all libraries in the same directory (we can do that
    1.66 @@ -273,7 +271,7 @@
    1.67          CT_DoExecLog ALL ln -sf "lib" "${CT_PREFIX_DIR}/lib64"
    1.68          CT_DoExecLog ALL ln -sf "lib" "${CT_SYSROOT_DIR}/lib64"
    1.69          CT_DoExecLog ALL ln -sf "lib" "${CT_SYSROOT_DIR}/usr/lib64"
    1.70 -        CT_DoExecLog ALL ln -sf "sys-root/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib64"
    1.71 +        CT_DoExecLog ALL ln -sf "lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib64"
    1.72      fi
    1.73  
    1.74      # Determine build system if not set by the user