# HG changeset patch # User "Yann E. MORIN" # Date 1296065598 -3600 # Node ID 4960f5d9f8291d5417452b8438705145f3e002da # Parent 7d1e018167b5d34906a0dfab3f30ada13b9542e7 scripts: squash the multi-slash in the sysroot symlink Signed-off-by: "Yann E. MORIN" diff -r 7d1e018167b5 -r 4960f5d9f829 scripts/crosstool-NG.sh.in --- a/scripts/crosstool-NG.sh.in Sat Jan 29 00:57:02 2011 +0100 +++ b/scripts/crosstool-NG.sh.in Wed Jan 26 19:13:18 2011 +0100 @@ -292,10 +292,11 @@ # Arrange paths depending on wether we use sysroot or not. if [ "${CT_USE_SYSROOT}" = "y" ]; then - CT_SYSROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/${CT_SYSROOT_NAME}" + CT_SYSROOT_REL_DIR="${CT_SYSROOT_DIR_PREFIX}/${CT_SYSROOT_NAME}" + CT_SYSROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_REL_DIR}" CT_DEBUGROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/debug-root" CT_HEADERS_DIR="${CT_SYSROOT_DIR}/usr/include" - CT_SanitiseVarDir CT_SYSROOT_DIR CT_DEBUGROOT_DIR CT_HEADERS_DIR + CT_SanitiseVarDir CT_SYSROOT_REL_DIR CT_SYSROOT_DIR CT_DEBUGROOT_DIR CT_HEADERS_DIR BINUTILS_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}" CC_CORE_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}" CC_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}" @@ -335,7 +336,7 @@ if [ "${CT_USE_SYSROOT}" = "y" ]; then # Prevent gcc from installing its libraries outside of the sysroot - CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/${CT_SYSROOT_NAME}/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib" + CT_DoExecLog ALL ln -sf ".${CT_SYSROOT_REL_DIR}/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib" fi # Since we're *not* multilib on the target side, we want all the