Make-lang.in: Use GCC_FOR_TARGET when dealing with s-oscons-tmplt.i.

    gcc/ada/
	* gcc-interface/Make-lang.in: Use GCC_FOR_TARGET when dealing
	with s-oscons-tmplt.i.

    libada/
	* Makefile.in: Pass FLAGS_TO_PASS to sub-make for target
	oscons.

From-SVN: r138800

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 5d4f516e7714e95ab39eab280ac7fa7a62a92002..be092505283ae6b96ca9dbb719e18f21bc68db35 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-06  Samuel Tardieu  <sam@rfc1149.net>
+
+       * gcc-interface/Make-lang.in: Use GCC_FOR_TARGET when dealing
+       with s-oscons-tmplt.i.
+
 2008-08-06  Samuel Tardieu  <sam@rfc1149.net>
 
        * gcc-interface/Make-lang.in (OSCONS_CPPFLAGS): Remove.

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index 9233f1e71eabbafed8a8ecb03dc22b58467e664a..9af841d291595a40fced46ceccb823b686e1d9ef 100644 (file)
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -933,9 +933,9 @@ OSCONS_EXTRACT=../../../$(DECC) -DNATIVE \
   ./s-oscons-tmplt.exe > s-oscons-tmplt.s
 
 else
-OSCONS_CPP=../../../xgcc -B../../../ -E -C \
+OSCONS_CPP=$(GCC_FOR_TARGET) -E -C \
   -DTARGET=\"$(target)\" s-oscons-tmplt.c > s-oscons-tmplt.i
-OSCONS_EXTRACT=../../../xgcc -S -B../../../ s-oscons-tmplt.i
+OSCONS_EXTRACT=$(GCC_FOR_TARGET) -S s-oscons-tmplt.i
 endif
 
 ada/s-oscons-$(THREAD_KIND).ads : ada/s-oscons-tmplt.c ada/gsocket.h ada/xoscons.adb ada/xutil.ads ada/xutil.adb

diff --git a/libada/ChangeLog b/libada/ChangeLog
index 89eb1dbeb8992e87706617e82e63cb1b73aa8509..e56394e0a40396601050c0cd4bb187abba12391a 100644 (file)
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-06  Samuel Tardieu  <sam@rfc1149.net>
+
+       * Makefile.in: Pass FLAGS_TO_PASS to sub-make for target
+       oscons.
+
 2008-08-06  Thomas Quinot  <quinot@adacore.com>
 
        * Makefile.in: Now generate s-oscons-$(THREAD_KIND).

diff --git a/libada/Makefile.in b/libada/Makefile.in
index e8ca515f82b51f6df537f156c3ff7739006895ce..211e3eb50f1247131739f870a5af4d0162b8d5cc 100644 (file)
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -94,7 +94,9 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: oscons $(GCC_DIR)/ada/Makefile
        && touch stamp-libada
 
 oscons:
-       $(MAKE) -C $(GCC_DIR) THREAD_KIND="$(THREAD_KIND)" ada/s-oscons-$(THREAD_KIND).ads
+       $(MAKE) -C $(GCC_DIR) THREAD_KIND="$(THREAD_KIND)" \
+         $(FLAGS_TO_PASS) \
+         ada/s-oscons-$(THREAD_KIND).ads
 
 # Check uninstalled version.
 check: