PR other/40159

* Makefile.tpl (all): Don't end with unconditional success.
* Makefile.in: Rebuilt.

diff --git a/ChangeLog b/ChangeLog
index 242d4ecc85720faebab011313addbce72febbfb1..5c39cbdb97ef39819c5efb7c5cbb1d1c693772c7 100644 (file)
--- 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 8f3be10a1efb0106d0f903d0d57956eb72260fd8..5b0d4743069a704e5706959928700ebe11b426b6 100644 (file)
--- 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 f201ad1566fdd02f2680bc65d423e3513d49937d..d4b2f0314b7b5febe0732e466f35cd0636b17ebe 100644 (file)
--- 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 +]