Message-ID: <39391147.BD3B1804@softhome.net>
Date: Sat, 03 Jun 2000 17:08:07 +0300
From: Laurynas Biveinis <lauras AT softhome DOT net>
X-Mailer: Mozilla 4.72 [en] (Win98; U)
X-Accept-Language: en
MIME-Version: 1.0
To: DJGPP Workers <djgpp-workers AT delorie DOT com>
Subject: Testers wanted: a fix for GCC header problem
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Reply-To: djgpp-workers AT delorie DOT com

I'd like to get feedback from gcc CVS testers out there about this patch:

It allows to specify wanted header files in configure script indvidually 
for each platform and providing current list of header files as a default.

I'm very interested in how does this patch perform on non-DJGPP platforms,
because currently I don't have access to any.

Thanks in advance,
Laurynas
---8<---8<---

diff -u -r --exclude=*.c --exclude=configure. cvs/gcc/gcc/configure.in gcc/gcc/configure.in
--- cvs/gcc/gcc/configure.in	Thu Jun  1 09:26:40 2000
+++ gcc/gcc/configure.in	Sat Jun  3 16:04:54 2000
@@ -548,6 +548,10 @@
 	extra_gcc_objs=
 	xm_defines=
 	float_format=
+	# Set this to GCC header files to provide
+	user_h="${srcdir}/ginclude/stdarg.h ${srcdir}/ginclude/stddef.h \
+  	  ${srcdir}/ginclude/varargs.h ${srcdir}/ginclude/proto.h \
+	  ${srcdir}/ginclude/stdbool.h ${srcdir}/ginclude/iso646.h"
 	# Set this to force installation and use of collect2.
 	use_collect2=
 	# Set this to override the default target model.
@@ -1571,6 +1575,7 @@
 		gas=yes
 		exeext=.exe
 		float_format=none
+		user_h=
 		case $host in *pc-msdosdjgpp*)
 			target_alias=djgpp
 			;;
@@ -5009,7 +5014,7 @@
 AC_SUBST(thread_file)
 AC_SUBST(tm_file_list)
 AC_SUBST(will_use_collect2)
-
+AC_SUBST(user_h)
 
 AC_SUBST_FILE(target_overrides)
 AC_SUBST_FILE(host_overrides)
diff -u -r --exclude=*.c --exclude=configure. cvs/gcc/gcc/Makefile.in gcc/gcc/Makefile.in
--- cvs/gcc/gcc/Makefile.in	Sat Jun  3 08:21:36 2000
+++ gcc/gcc/Makefile.in	Sat Jun  3 16:33:38 2000
@@ -150,10 +150,8 @@
 
 # Header files that are made available under the same name
 # to programs compiled with GCC.
-USER_H = $(srcdir)/ginclude/stdarg.h $(srcdir)/ginclude/stddef.h \
-    $(srcdir)/ginclude/varargs.h $(srcdir)/ginclude/proto.h \
-    $(srcdir)/ginclude/stdbool.h $(srcdir)/ginclude/iso646.h \
-    $(EXTRA_HEADERS) $(LANG_EXTRA_HEADERS)
+# This is overrided by configure
+USER_H = @user_h@ $(EXTRA_HEADERS) $(LANG_EXTRA_HEADERS)
 
 # Target to use whe installing assert.h.  Some systems may
 # want to set this empty.
@@ -1902,7 +1900,11 @@
 # this is necessary because VPATH could add a dirname.
 # Using basename would be simpler, but some systems don't have it.
 # The touch command is here to workaround an AIX/Linux NFS bug.
-	-if [ -d include ] ; then true; else mkdir include; chmod a+rx include; fi
+	-if [ -d include ] | [ -z "$(USER_H)" ] ;\
+            then true; \
+        else \
+            mkdir include; chmod a+rx include;\
+        fi
 	for file in .. $(USER_H); do \
 	  if [ X$$file != X.. ]; then \
 	    realfile=`echo $$file | sed -e 's|.*/\([^/]*\)$$|\1|'`; \