Improve C++ header location detection (bug 13966)

This commit is contained in:
Allan McRae 2012-09-06 00:16:24 +10:00
parent a0070b7e70
commit c4e85184d2
4 changed files with 18 additions and 15 deletions

View File

@ -1,3 +1,10 @@
2012-09-05 Allan McRae <allan@archlinux.org>
[BS #13966]
* configure.in (CXX_SYSINCLUDES): Use compiler output to
determine header location.
* configure: Regenerated.
2012-09-05 Andreas Schwab <schwab@linux-m68k.org> 2012-09-05 Andreas Schwab <schwab@linux-m68k.org>
* stdlib/gen-tst-strtod-round.c (formats): Add Motorola extended * stdlib/gen-tst-strtod-round.c (formats): Add Motorola extended

6
NEWS
View File

@ -10,9 +10,9 @@ Version 2.17
* The following bugs are resolved with this release: * The following bugs are resolved with this release:
3479, 5400, 6778, 6808, 9685, 9914, 11607, 13412, 13717, 13696, 13939, 3479, 5400, 6778, 6808, 9685, 9914, 11607, 13412, 13717, 13696, 13939,
14042, 14090, 14166, 14150, 14151, 14154, 14157, 14166, 14173, 14195, 13966, 14042, 14090, 14166, 14150, 14151, 14154, 14157, 14166, 14173,
14252, 14283, 14298, 14303, 14307, 14328, 14331, 14336, 14337, 14347, 14195, 14252, 14283, 14298, 14303, 14307, 14328, 14331, 14336, 14337,
14349, 14459, 14476, 14505, 14516, 14519, 14532, 14538 14347, 14349, 14459, 14476, 14505, 14516, 14519, 14532, 14538
* Support for STT_GNU_IFUNC symbols added for s390 and s390x. * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
Optimized versions of memcpy, memset, and memcmp added for System z10 and Optimized versions of memcpy, memset, and memcmp added for System z10 and

10
configure vendored
View File

@ -5345,13 +5345,11 @@ if test -n "$sysheaders"; then
CXX_SYSINCLUDES= CXX_SYSINCLUDES=
cxxversion=`$CXX -dumpversion 2>&5` && cxxversion=`$CXX -dumpversion 2>&5` &&
cxxmachine=`$CXX -dumpmachine 2>&5` && cxxmachine=`$CXX -dumpmachine 2>&5` &&
for d in include "$cxxmachine/include"; do cxxplus=`$CXX -print-prog-name=cc1plus`
i=../../../../$d/c++/$cxxversion cxxheaders=`$cxxplus -v /dev/null 2>&1 | sed -n '/ \//{p;q;}' | sed 's/ //'`
cxxheaders=`$CXX -print-file-name="$i"` && test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" && CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
-isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward" -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
done
fi fi
fi fi

View File

@ -975,13 +975,11 @@ if test -n "$sysheaders"; then
CXX_SYSINCLUDES= CXX_SYSINCLUDES=
cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` && cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&
cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` && cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` &&
for d in include "$cxxmachine/include"; do cxxplus=`$CXX -print-prog-name=cc1plus`
i=../../../../$d/c++/$cxxversion cxxheaders=`$cxxplus -v /dev/null 2>&1 | sed -n '/ \//{p;q;}' | sed 's/ //'`
cxxheaders=`$CXX -print-file-name="$i"` && test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" && CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
-isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward" -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
done
fi fi
fi fi
AC_SUBST(SYSINCLUDES) AC_SUBST(SYSINCLUDES)