PR other/40159

* Makefile.tpl (all): Don't assume gcc-bootstrap and
gcc-no-bootstrap are mutually exclusive.
* Makefile.in: Rebuilt.

diff --git a/ChangeLog b/ChangeLog
index 5c39cbdb97ef39819c5efb7c5cbb1d1c693772c7..a8bb83478cc554c9dd1ae078385ac571e1ea1609 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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

diff --git a/Makefile.in b/Makefile.in
index 5b0d4743069a704e5706959928700ebe11b426b6..110f7d6965927fc85d3c0a6442a1096396ea007f 100644 (file)
--- 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 d4b2f0314b7b5febe0732e466f35cd0636b17ebe..bc7c415f090d796cf7f5531d033b5db913893443 100644 (file)
--- 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 +]