From 6001bba47392e5c6b6790211bf408b34df53fb5c Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Sun, 6 Dec 2015 18:44:56 +0000 Subject: gnattools/ PR ada/50048 * Makefile.in (ftop_srcdir): New variable. (INCLUDES_FOR_SUBDIR): Use -iquote and $(ftop_srcdir). gcc/ada/ PR ada/50048 * gcc-interface/Makefile.in (INCLUDES): Use -iquote. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@231341 138bc75d-0d04-0410-961f-82ee72b054a4 --- gnattools/ChangeLog | 6 ++++++ gnattools/Makefile.in | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'gnattools') diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog index 4daff874eb1..bdcd968f308 100644 --- a/gnattools/ChangeLog +++ b/gnattools/ChangeLog @@ -1,3 +1,9 @@ +2015-12-06 Eric Botcazou + + PR ada/50048 + * Makefile.in (ftop_srcdir): New variable. + (INCLUDES_FOR_SUBDIR): Use -iquote and $(ftop_srcdir). + 2015-06-08 John Marino * configure.ac (*-*-dragonfly*): New configuration. diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in index 423cc6e950c..0c889eeec7b 100644 --- a/gnattools/Makefile.in +++ b/gnattools/Makefile.in @@ -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 = \ -- cgit v1.2.3