diff options
| author | Richard Biener <rguenther@suse.de> | 2017-08-17 13:39:58 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2017-08-17 13:39:58 +0000 |
| commit | 909e448f672250610dd93204be3f9abe42748311 (patch) | |
| tree | f5a8506e5f54242e346cc6536b12535a08dab141 /gnattools | |
| parent | ea58eb88d9b440773e146bd6cb39abb9a9fb894f (diff) | |
re PR ada/81878 (--disable-bootstrap --enable-languages=ada fails)
2017-08-17 Richard Biener <rguenther@suse.de>
PR ada/81878
* Makefile.in (CXX_LFLAGS): Remove.
(TOOLS_FLAGS_TO_PASS_NATIVE): Pass $(CXX) as CXX.
(TOOLS_FLAGS_TO_PASS_RE): Likewise.
From-SVN: r251150
Diffstat (limited to 'gnattools')
| -rw-r--r-- | gnattools/ChangeLog | 7 | ||||
| -rw-r--r-- | gnattools/Makefile.in | 10 |
2 files changed, 9 insertions, 8 deletions
diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog index 9432ce1add5..95c317b8bf8 100644 --- a/gnattools/ChangeLog +++ b/gnattools/ChangeLog @@ -1,3 +1,10 @@ +2017-08-17 Richard Biener <rguenther@suse.de> + + PR ada/81878 + * Makefile.in (CXX_LFLAGS): Remove. + (TOOLS_FLAGS_TO_PASS_NATIVE): Pass $(CXX) as CXX. + (TOOLS_FLAGS_TO_PASS_RE): Likewise. + 2016-05-16 Eric Botcazou <ebotcazou@adacore.com> * configure.ac: Add ACX_NONCANONICAL_HOST. diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in index b0860eaf96d..d19147fe5d7 100644 --- a/gnattools/Makefile.in +++ b/gnattools/Makefile.in @@ -69,16 +69,10 @@ INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. \ -iquote $(fsrcdir) -I$(ftop_srcdir)/include ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada -CXX_LFLAGS = \ - -B../../../$(target_noncanonical)/libstdc++-v3/src/.libs \ - -B../../../$(target_noncanonical)/libstdc++-v3/libsupc++/.libs \ - -L../../../$(target_noncanonical)/libstdc++-v3/src/.libs \ - -L../../../$(target_noncanonical)/libstdc++-v3/libsupc++/.libs - # Variables for gnattools, native TOOLS_FLAGS_TO_PASS_NATIVE= \ "CC=../../xgcc -B../../" \ - "CXX=../../xg++ -B../../ $(CXX_LFLAGS)" \ + "CXX=$(CXX)" \ "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \ "LDFLAGS=$(LDFLAGS)" \ "ADAFLAGS=$(ADAFLAGS)" \ @@ -96,7 +90,7 @@ TOOLS_FLAGS_TO_PASS_NATIVE= \ # Variables for regnattools TOOLS_FLAGS_TO_PASS_RE= \ "CC=../../xgcc -B../../" \ - "CXX=../../xg++ -B../../ $(CXX_LFLAGS)" \ + "CXX=$(CXX)" \ "CFLAGS=$(CFLAGS)" \ "LDFLAGS=$(LDFLAGS)" \ "ADAFLAGS=$(ADAFLAGS)" \ |