From 1a7613f0b82be784850b463624686e8dded3b357 Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <aoliva@redhat.com>
Date: Tue, 19 May 2009 00:01:50 +0000
Subject: [PATCH] PR other/40159 * Makefile.tpl (all): Don't end with
 unconditional success. * Makefile.in: Rebuilt.

---
 ChangeLog    |  6 ++++++
 Makefile.in  |  8 ++++----
 Makefile.tpl | 10 +++++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 242d4ecc8..5c39cbdb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR other/40159
+	* Makefile.tpl (all): Don't end with unconditional success.
+	* Makefile.in: Rebuilt.
+
 2009-05-12  Alexandre Oliva  <aoliva@redhat.com>
 
 	PR target/37137
diff --git a/Makefile.in b/Makefile.in
index 8f3be10a1..5b0d47430 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -859,11 +859,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; \
-@if gcc-bootstrap
-	fi; \
-@endif gcc-bootstrap
-	:
+	fi
 
 .PHONY: all-build
 
diff --git a/Makefile.tpl b/Makefile.tpl
index f201ad156..d4b2f0314 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -620,16 +620,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; \
-@if gcc-bootstrap
-	fi; \
-@endif gcc-bootstrap
-	:
+	fi
 
 .PHONY: all-build
 [+ FOR build_modules +]