re PR ada/50048 ("cc1: note: obsolete option -I- used, please use -iquote instead" during bootstrap)

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.

From-SVN: r231341
This commit is contained in:
Eric Botcazou 2015-12-06 18:44:56 +00:00 committed by Eric Botcazou
parent 62e56a0d65
commit e4b2093f3c
4 changed files with 19 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2015-12-06 Eric Botcazou <ebotcazou@adacore.com>
PR ada/50048
* gcc-interface/Makefile.in (INCLUDES): Use -iquote.
2015-12-06 Eric Botcazou <ebotcazou@adacore.com>
PR ada/56274

View File

@ -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

View File

@ -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.

View File

@ -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 = \