Makefile.tpl (stage_last): Define $r and $s before using $(RECURSE_FLAGS_TO_PASS).

* Makefile.tpl (stage_last): Define $r and $s before using
$(RECURSE_FLAGS_TO_PASS).
* Makefile.in: Regenerate

From-SVN: r143968

diff --git a/ChangeLog b/ChangeLog
index 8faf33a405d2d8a79aec8d6a538dee9962c07e40..9a4655f476ba492a6558c51a75f1d5679609b23b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-05  Andreas Schwab  <schwab@suse.de>
+
+       * Makefile.tpl (stage_last): Define $r and $s before using
+       $(RECURSE_FLAGS_TO_PASS).
+       * Makefile.in: Regenerate
+
 2009-01-24  Release Manager
 
        * GCC 4.3.3 released.
@@ -241,7 +247,7 @@
        * Makefile.def: Add libgomp config as a maybe dependency for libstdc++.
        * configure: Regenerate.
        * Makefile.in: Regenerate.
-       
+
 2007-09-17  Andreas Schwab  <schwab@suse.de>
 
        * configure.ac: Raise minimum makeinfo version to 4.6.
@@ -433,13 +439,13 @@
        * configure.ac: Likewise.
        * Makefile.in: Regenerate.
        * configure: Regenerate.
-                                               
+
 2007-06-28  DJ Delorie  <dj@redhat.com>
 
        * configure.ac (arm*-*-linux-gnueabi): Don't build libgloss if we're
        not building newlib.
        * configure: Regenerated.
-       
+
 2007-06-28  Jan Sjodin  <jan.sjodin@amd.com>
 
        * MAINTAINERS (Write After Approval): Add myself.
@@ -618,7 +624,7 @@
 2007-04-04  Christian Bruel  <christian.bruel@st.com>
 
        * MAINTAINERS (Write After Approval): Add myself.
-       
+
 2007-04-02  Dave Korn  <dave.korn@artimi.com>
 
        * MAINTAINERS (Write After Approval): Add myself.
@@ -630,7 +636,7 @@
 2007-03-28  Dwarakanath Rajagopal  <dwarak.rajagopal@amd.com>
 
        * MAINTAINERS (Write After Approval): Add myself.
-       
+
 2007-03-24  Ayal Zaks  <zaks@il.ibm.com>
 
        * MAINTAINERS (Modulo Scheduler): Add myself.

diff --git a/Makefile.in b/Makefile.in
index f03f457da08fa308b2787e0149463ce8ba1275b2..4995acbc3bd723cfefbb6316d63f71bbeaac2237 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -51167,6 +51167,8 @@ do-distclean: distclean-stage1
 # Provide a GCC build when we're building target libraries.  This does
 # not work as a dependency, just as the minimum necessary to avoid errors.
 stage_last:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
 
 # Same as unstage, but not phony and defaulting to stage1-start.  We place

diff --git a/Makefile.tpl b/Makefile.tpl
index 95c1b38fe86b3c7cb70f070740bfadbe96d2e153..f8164e4aaae2e04610c4c1f7fe634a4cc7384a7d 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1432,6 +1432,8 @@ do-distclean: distclean-stage1
 # Provide a GCC build when we're building target libraries.  This does
 # not work as a dependency, just as the minimum necessary to avoid errors.
 stage_last:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
 
 # Same as unstage, but not phony and defaulting to stage1-start.  We place