scripts: do not provide to-sysroot include symlink
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Oct 31 16:50:07 2010 +0100 (2010-10-31)
changeset 216396082aa6459f
parent 2162 3cec1d170ba4
child 2164 4534da2b2bc1
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>
scripts/build/internals.sh
scripts/crosstool-NG.sh.in
     1.1 --- a/scripts/build/internals.sh	Sun Oct 24 22:03:53 2010 +0200
     1.2 +++ b/scripts/build/internals.sh	Sun Oct 31 16:50:07 2010 +0100
     1.3 @@ -155,10 +155,9 @@
     1.4          CT_DoExecLog ALL rm -f "${d}/lib64"
     1.5      done
     1.6  
     1.7 -    # Also remove the include/ and lib/ symlinks out-side of sysroot
     1.8 +    # Also remove the lib/ symlink out-side of sysroot
     1.9      if [ "${CT_USE_SYSROOT}" = "y" ]; then
    1.10          CT_DoExecLog ALL rm -f "${CT_PREFIX_DIR}/${CT_TARGET}/lib"
    1.11 -        CT_DoExecLog ALL rm -f "${CT_PREFIX_DIR}/${CT_TARGET}/include"
    1.12      fi
    1.13  
    1.14      CT_EndStep
     2.1 --- a/scripts/crosstool-NG.sh.in	Sun Oct 24 22:03:53 2010 +0200
     2.2 +++ b/scripts/crosstool-NG.sh.in	Sun Oct 31 16:50:07 2010 +0100
     2.3 @@ -324,8 +324,6 @@
     2.4      if [ "${CT_USE_SYSROOT}" = "y" ]; then
     2.5          # Prevent gcc from installing its libraries outside of the sys-root
     2.6          CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/sys-root/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib"
     2.7 -        # Prevent libc from installing its headers outside of the sysroot
     2.8 -        CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/sys-root/usr/include" "${CT_PREFIX_DIR}/${CT_TARGET}/include"
     2.9      fi
    2.10  
    2.11      # Since we're *not* multilib on the target side, we want all the