OSDN Git Service

PR other/40159
authoraoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 19 May 2009 01:30:35 +0000 (01:30 +0000)
committeraoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 19 May 2009 01:30:35 +0000 (01:30 +0000)
* 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
Makefile.in
Makefile.tpl

index f445669..d8ef95d 100644 (file)
--- 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.
 
index 116de9d..23b3688 100644 (file)
@@ -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
 
index faa9f3c..ff058d6 100644 (file)
@@ -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 +]