1.1 --- a/scripts/crosstool-NG.sh.in Wed Aug 24 00:12:41 2011 +0200
1.2 +++ b/scripts/crosstool-NG.sh.in Wed Sep 07 01:22:37 2011 +0200
1.3 @@ -273,7 +273,7 @@
1.4
1.5 # Arrange paths depending on wether we use sysroot or not.
1.6 if [ "${CT_USE_SYSROOT}" = "y" ]; then
1.7 - CT_SYSROOT_REL_DIR="${CT_SYSROOT_DIR_PREFIX}/${CT_SYSROOT_NAME}"
1.8 + CT_SYSROOT_REL_DIR="${CT_SYSROOT_DIR_PREFIX:+${CT_SYSROOT_DIR_PREFIX}/}${CT_SYSROOT_NAME}"
1.9 CT_SYSROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_REL_DIR}"
1.10 CT_DEBUGROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/debug-root"
1.11 CT_HEADERS_DIR="${CT_SYSROOT_DIR}/usr/include"
1.12 @@ -317,7 +317,9 @@
1.13
1.14 if [ "${CT_USE_SYSROOT}" = "y" ]; then
1.15 # Prevent gcc from installing its libraries outside of the sysroot
1.16 - CT_DoExecLog ALL ln -sf ".${CT_SYSROOT_REL_DIR}/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib"
1.17 + CT_Pushd "${CT_PREFIX_DIR}/${CT_TARGET}"
1.18 + CT_DoExecLog ALL ln -sf "${CT_SYSROOT_REL_DIR}/lib" "lib"
1.19 + CT_Popd
1.20 fi
1.21
1.22 # Since we're *not* multilib on the target side, we want all the