# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1288540207 -3600
# Node ID 96082aa6459f11d1105a4c9af5c4652883494a6e
# Parent  3cec1d170ba4fac8ac09b1f8ffe52900329a58e1
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>

diff -r 3cec1d170ba4 -r 96082aa6459f scripts/build/internals.sh
--- a/scripts/build/internals.sh	Sun Oct 24 22:03:53 2010 +0200
+++ b/scripts/build/internals.sh	Sun Oct 31 16:50:07 2010 +0100
@@ -155,10 +155,9 @@
         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
diff -r 3cec1d170ba4 -r 96082aa6459f scripts/crosstool-NG.sh.in
--- a/scripts/crosstool-NG.sh.in	Sun Oct 24 22:03:53 2010 +0200
+++ b/scripts/crosstool-NG.sh.in	Sun Oct 31 16:50:07 2010 +0100
@@ -324,8 +324,6 @@
     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