summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure8
-rw-r--r--configure.in8
-rw-r--r--nptl/ChangeLog4
4 files changed, 21 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b6f044a68f..1f5c759cd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/configure b/configure
index 1f2cd4fc53..4b969787e3 100755
--- a/configure
+++ b/configure
@@ -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 6ea1b26ff3..3098ebfd3d 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 f79a43e436..e22f3870a9 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