diff options
| author | Roland McGrath <roland@gnu.org> | 2008-02-01 00:20:11 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2008-02-01 00:20:11 +0000 |
| commit | 67fbfa5ca15f75774dcb3794aceb06aa42544c94 (patch) | |
| tree | ae838cac91829ccc16353dd496d1e411fd6623bc | |
| parent | 363a641b1c856bf497840c6f7ed975366b48eb0e (diff) | |
| download | glibc-67fbfa5ca15f75774dcb3794aceb06aa42544c94.zip glibc-67fbfa5ca15f75774dcb3794aceb06aa42544c94.tar.gz glibc-67fbfa5ca15f75774dcb3794aceb06aa42544c94.tar.bz2 | |
[BZ #5442]cvs/fedora-glibc-20080201T1017
* configure.in: Use -print-file-name if it yields a directory,
for each of include and include-fixed.
* configure: Regenerated.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | nptl/ChangeLog | 4 |
4 files changed, 21 insertions, 4 deletions
@@ -1,5 +1,10 @@ 2008-01-31 Roland McGrath <roland@redhat.com> + [BZ #5442] + * configure.in: Use -print-file-name if it yields a directory, + for each of include and include-fixed. + * configure: Regenerated. + * Makeconfig (sysd-rules-targets): New variable. * sysdeps/unix/make-syscalls.sh: Use it in the rules emitted. * sysdeps/unix/Makefile (omit-deps): Append variants for each target. @@ -5065,8 +5065,12 @@ echo "$as_me: WARNING: # header directory and add that to the list. NOTE: Only does the right # thing on a system that doesn't need fixincludes. (Not presently a problem.) if test -n "$sysheaders"; then - ccheaders=`$CC -print-file-name=include` - SYSINCLUDES="-nostdinc -isystem $ccheaders \ + SYSINCLUDES=-nostdinc + for d in include include-fixed; do + i=`$CC -print-file-name="$d"` && test "x$i" != "x$d" && + SYSINCLUDES="$SYSINCLUDES -isystem $i" + done + SYSINCLUDES="$SYSINCLUDES \ -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" if test -n "$CXX"; then cxxversion=`$CXX -dumpversion 2>&5` && diff --git a/configure.in b/configure.in index 6ea1b26..3098ebf 100644 --- a/configure.in +++ b/configure.in @@ -914,8 +914,12 @@ test -n "$aux_missing" && AC_MSG_WARN([ # header directory and add that to the list. NOTE: Only does the right # thing on a system that doesn't need fixincludes. (Not presently a problem.) if test -n "$sysheaders"; then - ccheaders=`$CC -print-file-name=include` - SYSINCLUDES="-nostdinc -isystem $ccheaders \ + SYSINCLUDES=-nostdinc + for d in include include-fixed; do + i=`$CC -print-file-name="$d"` && test "x$i" != x && test "x$i" != "x$d" && + SYSINCLUDES="$SYSINCLUDES -isystem $i" + done + SYSINCLUDES="$SYSINCLUDES \ -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" if test -n "$CXX"; then cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` && diff --git a/nptl/ChangeLog b/nptl/ChangeLog index f79a43e..e22f387 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2008-01-31 Roland McGrath <roland@redhat.com> + + * Makefile (omit-deps): Variable removed. + 2008-01-30 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sem_post.S (sem_post): Avoid |