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

diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog
index 9432ce1add596852e2f483e2c2ef4812229a1e1a..95c317b8bf88bcf34ee0e46ef0a02b162a3982aa 100644 (file)
--- 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 b0860eaf96d9288893ccdec2bb7d9044ade32fd7..d19147fe5d74753249d9b9d8dceab79da72b1537 100644 (file)
--- 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)" \