1.1 --- a/scripts/crosstool-NG.sh.in Wed Oct 06 22:54:48 2010 +0200
1.2 +++ b/scripts/crosstool-NG.sh.in Thu Oct 07 22:37:06 2010 +0200
1.3 @@ -328,23 +328,22 @@
1.4 CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/sys-root/usr/include" "${CT_PREFIX_DIR}/${CT_TARGET}/include"
1.5 fi
1.6
1.7 - # Now, in case we're 64 bits, just have lib64/ be a symlink to lib/
1.8 - # so as to have all libraries in the same directory (we can do that
1.9 - # because we are *not* multilib).
1.10 - # Mips64 with n32 emulation install its libs in lib32, so also prepare
1.11 - # these symlinks
1.12 - # Not all the symlinks are necessary, but better safe than sorry...
1.13 - if [ "${CT_ARCH_64}" = "y" ]; then
1.14 - for d in \
1.15 - "${CT_PREFIX_DIR}" \
1.16 - "${CT_SYSROOT_DIR}" \
1.17 - "${CT_SYSROOT_DIR}/usr" \
1.18 - "${CT_PREFIX_DIR}/${CT_TARGET}" \
1.19 - ; do
1.20 - CT_DoExecLog ALL ln -sf "lib" "${d}/lib32"
1.21 - CT_DoExecLog ALL ln -sf "lib" "${d}/lib64"
1.22 - done
1.23 - fi
1.24 + # Since we're *not* multilib on the target side, we want all the
1.25 + # libraries to end up in "lib". We create "lib64" (for 64-bit
1.26 + # build or host architectures) and "lib32" (for 32-bit emulation
1.27 + # on 64-bit) as symlinks to "lib".
1.28 + #
1.29 + # Not all of these symlinks are necessary, but better safe than
1.30 + # sorry. They are summarily removed by build/internals.sh:do_finish.
1.31 + for d in \
1.32 + "${CT_PREFIX_DIR}" \
1.33 + "${CT_SYSROOT_DIR}" \
1.34 + "${CT_SYSROOT_DIR}/usr" \
1.35 + "${CT_PREFIX_DIR}/${CT_TARGET}" \
1.36 + ; do
1.37 + CT_DoExecLog ALL ln -sf "lib" "${d}/lib32"
1.38 + CT_DoExecLog ALL ln -sf "lib" "${d}/lib64"
1.39 + done
1.40
1.41 # Determine build system if not set by the user
1.42 if [ -z "${CT_BUILD}" ]; then