aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2012-09-06 00:16:24 +1000
committerAllan McRae <allan@archlinux.org>2012-09-06 00:16:24 +1000
commitc4e85184d2ded3f6a259948098a0c297a9cf0be6 (patch)
treeb762d78d613fe19594b52dfbba31b2b8d6631b74 /configure
parenta0070b7e7054df5f2a8da0467f15496ef8a3662f (diff)
downloadglibc-c4e85184d2ded3f6a259948098a0c297a9cf0be6.tar
glibc-c4e85184d2ded3f6a259948098a0c297a9cf0be6.tar.gz
glibc-c4e85184d2ded3f6a259948098a0c297a9cf0be6.tar.bz2
glibc-c4e85184d2ded3f6a259948098a0c297a9cf0be6.zip
Improve C++ header location detection (bug 13966)
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 4 insertions, 6 deletions
diff --git a/configure b/configure
index 6718bee0da..d159ce0e7b 100755
--- a/configure
+++ b/configure
@@ -5345,13 +5345,11 @@ if test -n "$sysheaders"; then
CXX_SYSINCLUDES=
cxxversion=`$CXX -dumpversion 2>&5` &&
cxxmachine=`$CXX -dumpmachine 2>&5` &&
- 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