diff options
| author | Allan McRae <allan@archlinux.org> | 2012-09-06 00:16:24 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2012-09-06 00:16:24 +1000 |
| commit | c4e85184d2ded3f6a259948098a0c297a9cf0be6 (patch) | |
| tree | b762d78d613fe19594b52dfbba31b2b8d6631b74 /configure.in | |
| parent | a0070b7e7054df5f2a8da0467f15496ef8a3662f (diff) | |
| download | glibc-c4e85184d2ded3f6a259948098a0c297a9cf0be6.zip glibc-c4e85184d2ded3f6a259948098a0c297a9cf0be6.tar.gz glibc-c4e85184d2ded3f6a259948098a0c297a9cf0be6.tar.bz2 | |
Improve C++ header location detection (bug 13966)
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 7de4b09..a174646 100644 --- a/configure.in +++ b/configure.in @@ -975,13 +975,11 @@ if test -n "$sysheaders"; then CXX_SYSINCLUDES= cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` && cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` && - for d in include "$cxxmachine/include"; do - i=../../../../$d/c++/$cxxversion - cxxheaders=`$CXX -print-file-name="$i"` && - test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" && - CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \ + cxxplus=`$CXX -print-prog-name=cc1plus` + cxxheaders=`$cxxplus -v /dev/null 2>&1 | sed -n '/ \//{p;q;}' | sed 's/ //'` + test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" && + CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \ -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward" - done fi fi AC_SUBST(SYSINCLUDES) |