re PR other/40159 ("make all" ignores build failures)

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

From-SVN: r147683

diff --git a/ChangeLog b/ChangeLog
index 9a4630eed79741ed10064afa25c8fa1ef28cc37b..f44566944af37da9477f16809a6102f91010cb39 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 d969c6d052977a683e62f6eb75c5957ea105862a..116de9de4e8e9025fda9fe884ac5a613759f1a0b 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 056296a78bf3cb4bf7453574b1bf3e2f231f2cc8..faa9f3c9204bebbc7a04e68b3643aac19a979d12 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 +]