This (presumably) fixes http://gcc.gnu.org/ml/gcc/2011-11/msg00404.html by always including the main GCC dir in INCLUDES_FOR_SUBDIR.
Tested on i586-suse-linux w/ and w/o --disable-libada, applied on the mainline. 2011-11-21 Eric Botcazou <ebotca...@adacore.com> * gcc-interface/Makefile.in (INCLUDES_FOR_SUBDIR): Add $(fsrcdir) by means of -iquote unconditionally. -- Eric Botcazou
Index: gcc-interface/Makefile.in =================================================================== --- gcc-interface/Makefile.in (revision 181505) +++ gcc-interface/Makefile.in (working copy) @@ -273,15 +273,9 @@ INCLUDES = -I- -I. -I.. -I$(srcdir)/ada ADA_INCLUDES = -I- -I. -I$(srcdir)/ada -INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. -iquote $(fsrcdir)/ada \ - -I$(fsrcdir)/../include - -ifeq ($(strip $(filter-out cygwin32% mingw32% pe,$(osys))),) - # On Windows native the tconfig.h files used by C runtime files needs to have - # the gcc source dir in its include dir list - INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. -iquote $(fsrcdir)/ada \ - -I$(fsrcdir)/../include -I$(fsrcdir) -endif +INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. \ + -iquote $(fsrcdir)/ada -iquote $(fsrcdir) \ + -I$(fsrcdir)/../include ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada