From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 6 Dec 2002 21:28:23 +0000 (+0000)
Subject: (fmt, testfmt): Remove -D_LIBC.
X-Git-Tag: cvs/glibc-2_3_2~620
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=d7e82198ecda5be52ce293571c9aa2a597a93765;p=glibc.git

(fmt, testfmt): Remove -D_LIBC.
---

diff --git a/posix/Makefile b/posix/Makefile
index d2cb9bee89..2ed0198393 100644
--- 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 80b26eecb3..3ade6d4227 100644
--- 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";