PR other/40159

* Makefile.tpl (all): Don't assume gcc-bootstrap and
gcc-no-bootstrap are mutually exclusive.
* Makefile.in: Rebuilt.
This commit is contained in:
Alexandre Oliva 2009-05-19 01:11:12 +00:00
parent 2ea7b6479f
commit b523320162
3 changed files with 16 additions and 9 deletions

View File

@ -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

View 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

View 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 +]