(fmt, testfmt): Remove -D_LIBC.

diff --git a/posix/Makefile b/posix/Makefile
index d2cb9bee89d1e5a75b01e347674fbf6d32a2a0c5..2ed01983932204370df66d57ea0e33a6c0a7fbd3 100644 (file)
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -155,7 +155,7 @@ endif
 
 $(objpfx)annexc.out: $(objpfx)annexc
        -$(dir $<)$(notdir $<) '$(CC)' \
-                              '-I../include -I.. $(+sysdep-includes) $(sysincludes)' > $@
+         '$(patsubst %,-I../%,$(sorted-subdirs)) -I../include -I.. $(+sysdep-includes) $(sysincludes)' > $@
 
 annexc-CFLAGS = -O
 $(objpfx)annexc: annexc.c

diff --git a/posix/annexc.c b/posix/annexc.c
index 80b26eecb395aea7f485496ff768675f87c42d71..3ade6d42271c7f0af1aaac927ae42c8adb9ff2fd 100644 (file)
--- a/posix/annexc.c
+++ b/posix/annexc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -615,12 +615,12 @@ static struct header
 /* Format string to build command to invoke compiler.  */
 static const char fmt[] = "\
 echo \"#include <%s>\" |\
-%s -E -dM -D_POSIX_SOURCE -D_LIBC %s \
+%s -E -dM -D_POSIX_SOURCE %s \
 -isystem `%s --print-prog-name=include` - > %s";
 
 static const char testfmt[] = "\
 echo \"#include <unistd.h>\n#if !defined %s || %s == -1\n#error not defined\n#endif\n\" |\
-%s -E -dM -D_POSIX_SOURCE -D_LIBC %s \
+%s -E -dM -D_POSIX_SOURCE %s \
 -isystem `%s --print-prog-name=include` - 2> /dev/null > %s";