AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix searching for C++ system headers for cross compilers

Browse Source
This commit is contained in:
Andreas Schwab 2011-10-15 20:08:45 +02:00
parent 2d1f3a4db6
commit 7872cfb09f
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-10-15 Andreas Schwab <schwab@linux-m68k.org>
* configure.in: Also look in $cxxmachine/include for C++ system
headers.
2011-09-27 Liubov Dmitrieva <liubov.dmitrieva@gmail.com>
* sysdeps/x86_64/multiarch/Makefile: (sysdep_routines): Add

9
configure vendored
View File

@ -5372,11 +5372,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>&5` &&
cxxmachine=`$CXX -dumpmachine 2>&5` &&
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

9
configure.in
View File

@ -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)