Tested on x86_64-suse-linux, applied on the mainline.
2015-12-06 Eric Botcazou <ebotca...@adacore.com>
PR ada/50048
* Makefile.in (ftop_srcdir): New variable.
(INCLUDES_FOR_SUBDIR): Use -iquote and $(ftop_srcdir).
2015-12-06 Eric Botcazou <ebotca...@adacore.com>
PR ada/50048
* gcc-interface/Makefile.in (INCLUDES): Use -iquote.
--
Eric BotcazouIndex: gcc/ada/gcc-interface/Makefile.in
===================================================================
--- gcc/ada/gcc-interface/Makefile.in (revision 231333)
+++ gcc/ada/gcc-interface/Makefile.in (working copy)
@@ -257,7 +257,8 @@ TOOLS_LIBS += @NO_PIE_FLAG@
# Both . and srcdir are used, in that order,
# so that tm.h and config.h will be found in the compilation
# subdirectory rather than in the source directory.
-INCLUDES = -I- -I. -I.. -I$(srcdir)/ada -I$(srcdir) -I$(ftop_srcdir)/include $(GMPINC)
+INCLUDES = -iquote . -iquote .. -iquote $(srcdir)/ada -iquote $(srcdir) \
+ -I $(ftop_srcdir)/include $(GMPINC)
ADA_INCLUDES = -I- -I. -I$(srcdir)/ada
Index: gnattools/Makefile.in
===================================================================
--- gnattools/Makefile.in (revision 231318)
+++ gnattools/Makefile.in (working copy)
@@ -57,12 +57,16 @@ ADAFLAGS= -gnatpg -gnata
# For finding the GCC build dir, which is used far too much
GCC_DIR=../gcc
+# Full path to top source directory
+ftop_srcdir := $(shell cd $(srcdir)/..;${PWD_COMMAND})
+
# Absolute srcdir for gcc (why do we want absolute? I dunno)
fsrcdir := $(shell cd $(srcdir)/../gcc/; ${PWD_COMMAND})
# Useful "subroutines" for the excess includes
-INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir)/ada -I$(fsrcdir)/config \
- -I$(fsrcdir)/../include -I$(fsrcdir)
+INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. \
+ -iquote $(fsrcdir)/ada -iquote $(fsrcdir)/config \
+ -iquote $(fsrcdir) -I$(ftop_srcdir)/include
ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
CXX_LFLAGS = \
