scripts: do not provide to-sysroot include symlink

Do not provide the PREFIX/TUPLE/include -> SYSROOT/usr/include symlink,
and let gcc install its dependable C++ headers were it sees fit to
install them.

See the test by Anthony (by the end of the messages):
  http://sourceware.org/ml/crossgcc/2010-10/msg00129.html
  http://sourceware.org/ml/crossgcc/2010-10/msg00134.html

See also the comment by Arnaud:
  http://sourceware.org/ml/crossgcc/2010-10/msg00157.html

Reported-by: Anthony Foiani <anthony.foiani@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
This commit is contained in:
Yann E. MORIN" 2010-10-31 16:50:07 +01:00
parent 5ddca154bb
commit ae27f71102
2 changed files with 1 additions and 4 deletions

View File

@ -155,10 +155,9 @@ do_finish() {
CT_DoExecLog ALL rm -f "${d}/lib64"
done
# Also remove the include/ and lib/ symlinks out-side of sysroot
# Also remove the lib/ symlink out-side of sysroot
if [ "${CT_USE_SYSROOT}" = "y" ]; then
CT_DoExecLog ALL rm -f "${CT_PREFIX_DIR}/${CT_TARGET}/lib"
CT_DoExecLog ALL rm -f "${CT_PREFIX_DIR}/${CT_TARGET}/include"
fi
CT_EndStep

View File

@ -324,8 +324,6 @@ if [ -z "${CT_RESTART}" ]; then
if [ "${CT_USE_SYSROOT}" = "y" ]; then
# Prevent gcc from installing its libraries outside of the sys-root
CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/sys-root/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib"
# Prevent libc from installing its headers outside of the sysroot
CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/sys-root/usr/include" "${CT_PREFIX_DIR}/${CT_TARGET}/include"
fi
# Since we're *not* multilib on the target side, we want all the