From 8b275095e0514b7698d3ed92a5a4ea28e0b5754c Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 24 Oct 2010 22:03:47 +0200
Subject: 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 --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index 45d36c3..e7e56f1 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -324,15 +324,6 @@ do_cc() {
     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
-- 
cgit v0.10.2-6-g49f6