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

$(RECURSE_FLAGS_TO_PASS).
* Makefile.in: Regenerate

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@143967 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/ChangeLog b/ChangeLog
index 067ba47..5e97121 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-30  Ian Lance Taylor  <iant@google.com>
 
        * MAINTAINERS: Move myself to the Global Reviewers list.
@@ -82,8 +88,8 @@
 
 2008-12-04  Jack Howarth  <howarth@bromo.med.uc.edu>
 
-        * configure.ac: Add double brackets on darwin[912].
-        * configure: Regenerate.
+       * configure.ac: Add double brackets on darwin[912].
+       * configure: Regenerate.
 
 2008-12-03  Daniel Kraft  <d@domob.eu>
 

diff --git a/Makefile.in b/Makefile.in
index 2df155e..3ca3f26 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -54861,6 +54861,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 f654fb3..acb349f 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1468,6 +1468,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