From bc1e0bea024ab9f18a55d84897ec69f23daffe8c Mon Sep 17 00:00:00 2001
From: aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 19 May 2009 01:30:35 +0000
Subject: [PATCH] PR other/40159 * Makefile.tpl (all): Don't assume
 gcc-bootstrap and gcc-no-bootstrap are mutually exclusive. * Makefile.in:
 Rebuilt.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@147695 138bc75d-0d04-0410-961f-82ee72b054a4
---
 ChangeLog    |  7 +++++++
 Makefile.in  | 10 +++++-----
 Makefile.tpl |  8 ++++----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f445669..d8ef95d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 2009-05-18  Alexandre Oliva  <aoliva@redhat.com>
 
 	PR other/40159
+	* Makefile.tpl (all): Don't assume gcc-bootstrap and
+	gcc-no-bootstrap are mutually exclusive.
+	* Makefile.in: Rebuilt.
+
+2009-05-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR other/40159
 	* Makefile.tpl (all): Don't end with unconditional success.
 	* Makefile.in: Rebuilt.
 
diff --git a/Makefile.in b/Makefile.in
index 116de9d..23b3688 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -854,16 +854,16 @@ all:
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 @if gcc-bootstrap
-	if [ -f stage_last ]; then : ; \
+	if [ -f stage_last ]; then \
 	  TFLAGS="$(STAGE$(shell sed s,^stage,, stage_last)_TFLAGS)"; \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
 	else \
 @endif gcc-bootstrap
-@if gcc-no-bootstrap
-	if :; then :; \
-@endif gcc-no-bootstrap
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target \
+@if gcc-bootstrap
+	    ; \
 	fi
+@endif gcc-bootstrap
 
 .PHONY: all-build
 
diff --git a/Makefile.tpl b/Makefile.tpl
index faa9f3c..ff058d6 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -625,11 +625,11 @@ all:
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
 	else \
 @endif gcc-bootstrap
-@if gcc-no-bootstrap
-	if :; then :; \
-@endif gcc-no-bootstrap
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target \
+@if gcc-bootstrap
+	    ; \
 	fi
+@endif gcc-bootstrap
 
 .PHONY: all-build
 [+ FOR build_modules +]
-- 
2.7.4