summaryrefslogtreecommitdiff
path: root/gnattools
diff options
context:
space:
mode:
authorebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2015-12-06 18:44:56 +0000
committerebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2015-12-06 18:44:56 +0000
commit97c2bc38170ef70eaa1f2b0652099dd49bf9b0d2 (patch)
tree9e64a2bc6ac62760ab9bac0e0884af9bedbd3996 /gnattools
parent1b1db4e0824aca226bee654a7c8d0ab5af69ae7b (diff)
downloadgcc-97c2bc38170ef70eaa1f2b0652099dd49bf9b0d2.tar.gz
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: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231341 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gnattools')
-rw-r--r--gnattools/ChangeLog6
-rw-r--r--gnattools/Makefile.in8
2 files changed, 12 insertions, 2 deletions
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 <ebotcazou@adacore.com>
+
+ PR ada/50048
+ * Makefile.in (ftop_srcdir): New variable.
+ (INCLUDES_FOR_SUBDIR): Use -iquote and $(ftop_srcdir).
+
2015-06-08 John Marino <gnugcc@marino.st>
* 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 = \