diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-10-10 22:07:36 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-10-10 22:07:36 +0000 |
| commit | 1e4a95361c71e8073f448012c3eeb6f09cc9a814 (patch) | |
| tree | 0813309debec083cc2e7699073e9f4f33c6e6f74 | |
| parent | d173d12e77c2ba9c46717353891f817333ce4995 (diff) | |
| download | glibc-1e4a95361c71e8073f448012c3eeb6f09cc9a814.tar glibc-1e4a95361c71e8073f448012c3eeb6f09cc9a814.tar.gz glibc-1e4a95361c71e8073f448012c3eeb6f09cc9a814.tar.bz2 glibc-1e4a95361c71e8073f448012c3eeb6f09cc9a814.zip | |
Use $CXX not cc1plus to locate C++ headers.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | configure.in | 5 |
3 files changed, 7 insertions, 6 deletions
@@ -1,5 +1,8 @@ 2012-10-10 Joseph Myers <joseph@codesourcery.com> + * configure.in: Run $CXX, not cc1plus, to locate C++ headers. + * configure: Regenerated. + * Makeconfig (+link-static-before-libc): Don't include $(link-static-libc). @@ -5342,10 +5342,9 @@ if test -n "$sysheaders"; then -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" if test -n "$CXX"; then CXX_SYSINCLUDES= - cxxversion=`$CXX -dumpversion 2>&5` && cxxmachine=`$CXX -dumpmachine 2>&5` && - cxxplus=`$CXX -print-prog-name=cc1plus` - cxxheaders=`$cxxplus -v /dev/null 2>&1 | sed -n '/ \//{p;q;}' | sed 's/ //'` + cxxheaders=`$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \ + | sed -n -e '1,/#include/d' -e '/^ \//{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" diff --git a/configure.in b/configure.in index b9b5703648..facde5e55a 100644 --- a/configure.in +++ b/configure.in @@ -973,10 +973,9 @@ if test -n "$sysheaders"; then -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` && - cxxplus=`$CXX -print-prog-name=cc1plus` - cxxheaders=`$cxxplus -v /dev/null 2>&1 | sed -n '/ \//{p;q;}' | sed 's/ //'` + cxxheaders=`$CXX -v -S -x c++ /dev/null -o /dev/null 2>&1 \ + | sed -n -e '1,/#include/d' -e '/^ \//{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" |