# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1287950633 -7200
# Node ID 3cec1d170ba4fac8ac09b1f8ffe52900329a58e1
# Parent  c27380b7204665b700433bb833f7e46d39dc8de7# Parent  3c648212298e6e03b1bc44393a3adf9cc333fa2b
Merge.

diff -r c27380b72046 -r 3cec1d170ba4 scripts/build/cc/gcc.sh
--- a/scripts/build/cc/gcc.sh	Sat Oct 23 23:29:46 2010 +0200
+++ b/scripts/build/cc/gcc.sh	Sun Oct 24 22:03:53 2010 +0200
@@ -332,15 +332,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