aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in8
-rw-r--r--Makefile.tpl10
3 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 242d4ec..5c39cbd 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 8f3be10..5b0d474 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 f201ad1..d4b2f03 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 +]