1.1 --- a/scripts/crosstool-NG.sh.in	Sat Jan 22 22:35:43 2011 +0100
     1.2 +++ b/scripts/crosstool-NG.sh.in	Tue Jan 25 20:31:16 2011 +0100
     1.3 @@ -283,9 +283,16 @@
     1.4  
     1.5  # Setting up the rest of the environment only if not restarting
     1.6  if [ -z "${CT_RESTART}" ]; then
     1.7 -    # Arrange paths depending on wether we use sys-root or not.
     1.8 +    case "${CT_SYSROOT_NAME}" in
     1.9 +        "")     CT_SYSROOT_NAME="sysroot";;
    1.10 +        .)      CT_Abort "Sysroot name is set to '.' which is forbidden";;
    1.11 +        *' '*)  CT_Abort "Sysroot name contains forbidden space(s): '${CT_SYSROOT_NAME}'";;
    1.12 +        */*)    CT_Abort "Sysroot name contains forbidden slash(es): '${CT_SYSROOT_NAME}'";;
    1.13 +    esac
    1.14 +
    1.15 +    # Arrange paths depending on wether we use sysroot or not.
    1.16      if [ "${CT_USE_SYSROOT}" = "y" ]; then
    1.17 -        CT_SYSROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/sys-root"
    1.18 +        CT_SYSROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/${CT_SYSROOT_NAME}"
    1.19          CT_DEBUGROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/debug-root"
    1.20          CT_HEADERS_DIR="${CT_SYSROOT_DIR}/usr/include"
    1.21          BINUTILS_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}"
    1.22 @@ -325,8 +332,8 @@
    1.23      CT_DoExecLog ALL mkdir -p "${CT_SYSROOT_DIR}/usr/include"
    1.24  
    1.25      if [ "${CT_USE_SYSROOT}" = "y" ]; then
    1.26 -        # Prevent gcc from installing its libraries outside of the sys-root
    1.27 -        CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/sys-root/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib"
    1.28 +        # Prevent gcc from installing its libraries outside of the sysroot
    1.29 +        CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/${CT_SYSROOT_NAME}/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib"
    1.30      fi
    1.31  
    1.32      # Since we're *not* multilib on the target side, we want all the