# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1287950627 -7200
# Node ID 3c648212298e6e03b1bc44393a3adf9cc333fa2b
# Parent  a0924619112015bdaa81a0a2313d21ef38607bc2
Revert #a09246191120: cc/gcc: fix C++ headers location

This was intended as a fix for g++ not finding its headers,
but it breaks in othe horrible ways. So just revert it.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff -r a09246191120 -r 3c648212298e scripts/build/cc/gcc.sh
--- a/scripts/build/cc/gcc.sh	Fri Oct 08 23:37:12 2010 +0200
+++ b/scripts/build/cc/gcc.sh	Sun Oct 24 22:03:47 2010 +0200
@@ -324,15 +324,6 @@
     CT_Test "Building ${CT_CC_LANG_OTHERS//,/ } language(s) is not yet supported. Will try..." -n "${CT_CC_LANG_OTHERS}"
     lang_opt=$(echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/,+/,/g; s/,*$//;')
 
-    # In case we build the C++ compiler, we have to tell gcc where to put the
-    # C++ headers, or else it will try to put it in prefix/tuple/include,
-    # which we make a symlink to sysroot/usr/include during the build, and
-    # that we delete (the symlink!) after the build, but gcc will not look
-    # in sysroot/usr/inlcude for C++ headers by default
-    if [ "${CT_CC_LANG_CXX}" = "y"   ]; then
-        extra_config+=("--with-gxx-include-dir=${CT_SYSROOT_DIR}/usr/include")
-    fi
-
     extra_config+=("--enable-languages=${lang_opt}")
     extra_config+=("--disable-multilib")
     for tmp in ARCH ABI CPU TUNE FPU FLOAT; do