| author | Darcy Watkins <dwatkins@tranzeo.com> |
| Thu Aug 05 18:19:07 2010 +0200 (2010-08-05) | |
| branch | 1.8 |
| changeset 2073 | a3b7a63dce01 |
| permissions | -rw-r--r-- |
| yann@1004 | 1 |
GCC trunk now has multiple internal headers directories, one |
| yann@1004 | 2 |
containing the self-contained GCC-provided headers and one containing |
| yann@1004 | 3 |
the <limits.h> (not self-contained but including libc's <limits.h> or |
| yann@1004 | 4 |
a fixed version thereof) and the fixed headers; more such directories |
| yann@1004 | 5 |
may be added in future. |
| yann@1004 | 6 |
|
| yann@1004 | 7 |
When glibc uses -nostdinc, it needs to use -isystem options for all |
| yann@1004 | 8 |
these internal directories. This patch teaches it about the |
| yann@1004 | 9 |
include-fixed directory (and is harmless with old GCC versions without |
| yann@1004 | 10 |
that directory). |
| yann@1004 | 11 |
|
| yann@1004 | 12 |
2007-03-18 Joseph Myers <joseph@codesourcery.com> |
| yann@1004 | 13 |
|
| yann@1004 | 14 |
* configure.in: Also pass -isystem option for GCC's include-fixed |
| yann@1004 | 15 |
directory. |
| yann@1004 | 16 |
* configure: Regenerate. |
| yann@1004 | 17 |
|
| yann@1004 | 18 |
|
| yann@1004 | 19 |
--- glibc-2.3.6.ori/configure.in 2008-10-22 14:55:58.000000000 +0200 |
| yann@1004 | 20 |
+++ glibc-2.3.6/configure.in 2008-10-22 14:56:15.000000000 +0200 |
| yann@1004 | 21 |
@@ -804,7 +804,7 @@ |
| yann@1004 | 22 |
# thing on a system that doesn't need fixincludes. (Not presently a problem.) |
| yann@1004 | 23 |
if test -n "$sysheaders"; then |
| yann@1004 | 24 |
ccheaders=`$CC -print-file-name=include` |
| yann@1004 | 25 |
- SYSINCLUDES="-nostdinc -isystem $ccheaders \ |
| yann@1004 | 26 |
+ SYSINCLUDES="-nostdinc -isystem $ccheaders -isystem $ccheaders-fixed \ |
| yann@1004 | 27 |
-isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" |
| yann@1004 | 28 |
fi |
| yann@1004 | 29 |
AC_SUBST(SYSINCLUDES) |
| yann@1004 | 30 |
--- glibc-2.3.6.ori/configure 2008-10-22 15:11:37.000000000 +0200 |
| yann@1004 | 31 |
+++ glibc-2.3.6/configure 2008-10-22 15:11:54.000000000 +0200 |
| yann@1004 | 32 |
@@ -4438,7 +4438,7 @@ |
| yann@1004 | 33 |
# thing on a system that doesn't need fixincludes. (Not presently a problem.) |
| yann@1004 | 34 |
if test -n "$sysheaders"; then |
| yann@1004 | 35 |
ccheaders=`$CC -print-file-name=include` |
| yann@1004 | 36 |
- SYSINCLUDES="-nostdinc -isystem $ccheaders \ |
| yann@1004 | 37 |
+ SYSINCLUDES="-nostdinc -isystem $ccheaders -isystem $ccheaders-fixed \ |
| yann@1004 | 38 |
-isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" |
| yann@1004 | 39 |
fi |
| yann@1004 | 40 |