cc/gcc: fix C++ headers location

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.

Implements a fix suggested by: Bryan Hundven <bryanhundven@gmail.com>

Reported-by: Anthony Foiani <anthony.foiani@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from a0924619112015bdaa81a0a2313d21ef38607bc2)
This commit is contained in:
Yann E. MORIN" 2010-10-08 23:37:12 +02:00
parent 817c166a04
commit 644f08a974

View File

@ -317,6 +317,15 @@ 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