diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-01-26 19:13:18 +0100 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-01-26 19:13:18 +0100 |
| commit | a2e31b9c53a6abc4cb58297016331255056f969e (patch) | |
| tree | 1143b5de75b39b7ffe64fa2903b500a69d8dc41d | |
| parent | 15da72b273012385133ae43ad45239b22e6aae81 (diff) | |
| download | crosstool-ng-a2e31b9c53a6abc4cb58297016331255056f969e.tar.gz crosstool-ng-a2e31b9c53a6abc4cb58297016331255056f969e.tar.bz2 crosstool-ng-a2e31b9c53a6abc4cb58297016331255056f969e.zip | |
scripts: squash the multi-slash in the sysroot symlink
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
| -rw-r--r-- | scripts/crosstool-NG.sh.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index fffb841e..9273e4cf 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -292,10 +292,11 @@ if [ -z "${CT_RESTART}" ]; then # 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 [ -z "${CT_RESTART}" ]; then 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 |