diff options
| author | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-05-19 01:30:35 +0000 |
|---|---|---|
| committer | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-05-19 01:30:35 +0000 |
| commit | bc1e0bea024ab9f18a55d84897ec69f23daffe8c (patch) | |
| tree | 54685a286073a1a0a2ac8507fd7dbbc688204bd1 | |
| parent | afaca4d8252c1e8b8bcdc548e2b5baabbd2bdcc4 (diff) | |
| download | gcc-bc1e0bea024ab9f18a55d84897ec69f23daffe8c.tar.gz | |
PR other/40159
* 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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | Makefile.tpl | 8 |
3 files changed, 16 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index f44566944af..d8ef95d55ab 100644 --- 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. diff --git a/Makefile.in b/Makefile.in index 116de9de4e8..23b3688283b 100644 --- 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 faa9f3c9204..ff058d660c5 100644 --- 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 +] |