re PR ada/81878 (--disable-bootstrap --enable-languages=ada fails)

	PR ada/81878
	Revert
	2018-10-29  Tamar Christina  <tamar.christina@arm.com>

	PR ada/81878
	* Makefile.in (TOOLS_FLAGS_TO_PASS_NATIVE): Add -B ../../.

	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: r265830

gnattools/ChangeLog

+2018-11-06  Eric Botcazou  <ebotcazou@adacore.com>
+
+	PR ada/81878
+	Revert
+	2018-10-29  Tamar Christina  <tamar.christina@arm.com>
+
+	PR ada/81878
+	* Makefile.in (TOOLS_FLAGS_TO_PASS_NATIVE): Add -B ../../.
+
+	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.
+
 2018-10-31  Joseph Myers  <joseph@codesourcery.com>
 
 	PR bootstrap/82856

gnattools/Makefile.in

@@ -69,13 +69,16 @@ 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
-# Due to Windows path translations (See PR ada/81878) we need to add
-# -B../../ to the compiler paths as a workaround for that $(CXX) contains
-# Unix style paths that won't be translated by the runtime.
 TOOLS_FLAGS_TO_PASS_NATIVE= \
 	"CC=../../xgcc -B../../" \
-	"CXX=$(CXX) -B../../" \
+	"CXX=../../xg++ -B../../ $(CXX_LFLAGS)" \
 	"CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \
 	"LDFLAGS=$(LDFLAGS)" \
 	"ADAFLAGS=$(ADAFLAGS)" \
@@ -93,7 +96,7 @@ TOOLS_FLAGS_TO_PASS_NATIVE= \
 # Variables for regnattools
 TOOLS_FLAGS_TO_PASS_RE= \
 	"CC=../../xgcc -B../../" \
-	"CXX=$(CXX)" \
+	"CXX=../../xg++ -B../../ $(CXX_LFLAGS)" \
 	"CFLAGS=$(CFLAGS)" \
 	"LDFLAGS=$(LDFLAGS)" \
 	"ADAFLAGS=$(ADAFLAGS)" \