| 1 | http://sourceware.org/bugzilla/show_bug.cgi?id=5442 |
| 2 | |
| 3 | diff -ruN glibc-2.6.1-old/configure.in glibc-2.6.1-new/configure.in |
| 4 | --- glibc-2.6.1-old/configure.in 2007-03-20 13:11:23.000000000 +0100 |
| 5 | +++ glibc-2.6.1-new/configure.in 2009-01-21 01:09:16.000000000 +0100 |
| 6 | @@ -911,8 +911,12 @@ |
| 7 | # header directory and add that to the list. NOTE: Only does the right |
| 8 | # thing on a system that doesn't need fixincludes. (Not presently a problem.) |
| 9 | if test -n "$sysheaders"; then |
| 10 | - ccheaders=`$CC -print-file-name=include` |
| 11 | - SYSINCLUDES="-nostdinc -isystem $ccheaders \ |
| 12 | + SYSINCLUDES=-nostdinc |
| 13 | + for d in include include-fixed; do |
| 14 | + i=`$CC -print-file-name="$d"` && test "x$i" != x && test "x$i" != "x$d" && |
| 15 | + SYSINCLUDES="$SYSINCLUDES -isystem $i" |
| 16 | + done |
| 17 | + SYSINCLUDES="$SYSINCLUDES \ |
| 18 | -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" |
| 19 | if test -n "$CXX"; then |
| 20 | cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` && |
| 21 | diff -ruN glibc-2.6.1-old/configure glibc-2.6.1-new/configure |
| 22 | --- glibc-2.6.1-old/configure 2007-07-31 15:46:12.000000000 +0200 |
| 23 | +++ glibc-2.6.1-new/configure 2009-01-21 01:09:13.000000000 +0100 |
| 24 | @@ -4562,8 +4562,12 @@ |
| 25 | # header directory and add that to the list. NOTE: Only does the right |
| 26 | # thing on a system that doesn't need fixincludes. (Not presently a problem.) |
| 27 | if test -n "$sysheaders"; then |
| 28 | - ccheaders=`$CC -print-file-name=include` |
| 29 | - SYSINCLUDES="-nostdinc -isystem $ccheaders \ |
| 30 | + SYSINCLUDES=-nostdinc |
| 31 | + for d in include include-fixed; do |
| 32 | + i=`$CC -print-file-name="$d"` && test "x$i" != "x$d" && |
| 33 | + SYSINCLUDES="$SYSINCLUDES -isystem $i" |
| 34 | + done |
| 35 | + SYSINCLUDES="$SYSINCLUDES \ |
| 36 | -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" |
| 37 | if test -n "$CXX"; then |
| 38 | cxxversion=`$CXX -dumpversion 2>&5` && |
| 39 | |
