diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-10-15 16:28:27 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-10-15 16:28:27 -0400 |
| commit | e9b25bd9303436af1de65afea4e984b640b2c81d (patch) | |
| tree | 066e112c2c11bab5f3fa1ff42ba70b71fa678537 /configure.in | |
| parent | fd5bdc0924e0cfd1688b632068c1b26f3b0c88da (diff) | |
| parent | b468825a053aed4db613f06ea88f94008bbf3472 (diff) | |
| download | glibc-e9b25bd9303436af1de65afea4e984b640b2c81d.tar glibc-e9b25bd9303436af1de65afea4e984b640b2c81d.tar.gz glibc-e9b25bd9303436af1de65afea4e984b640b2c81d.tar.bz2 glibc-e9b25bd9303436af1de65afea4e984b640b2c81d.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.in b/configure.in index b2949b4958..6977fe1015 100644 --- a/configure.in +++ b/configure.in @@ -1061,11 +1061,16 @@ if test -n "$sysheaders"; then SYSINCLUDES="$SYSINCLUDES \ -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" if test -n "$CXX"; then + CXX_SYSINCLUDES= cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` && cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` && - cxxheaders=`$CXX -print-file-name=../../../../include/c++/`"$cxxversion" && - CXX_SYSINCLUDES="-isystem $cxxheaders \ + 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 \ -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward" + done fi fi AC_SUBST(SYSINCLUDES) |