aboutsummaryrefslogtreecommitdiff
path: root/Makefile.tpl
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@codesourcery.com>2006-06-07 22:33:16 +0000
committerCarlos O'Donell <carlos@codesourcery.com>2006-06-07 22:33:16 +0000
commit4f0ef2d88b484966e5203cb6258aa1195be49688 (patch)
treeac3120b01974f52d99076d2f343e50735df3ee88 /Makefile.tpl
parent55f96808b53e376696617e575471ddc6ac7defbd (diff)
downloadgdb-4f0ef2d88b484966e5203cb6258aa1195be49688.zip
gdb-4f0ef2d88b484966e5203cb6258aa1195be49688.tar.gz
gdb-4f0ef2d88b484966e5203cb6258aa1195be49688.tar.bz2
2006-06-07 Carlos O'Donell <carlos@codesourcery.com>
Sync from gcc: 2006-06-06 David Ayers <d.ayers@inode.at> PR libobjc/13946 * Makefile.def: Add dependencies for libobjc which boehm-gc. * Makefile.in: Regenerate. * configure.in: Add --enable-objc-gc at toplevel and have it enable boehm-gc for Objective-C. Remove target-boehm-gc from libgcj. Add target-boehm-gc to target_libraries. Add target-boehm-gc to noconfigdirs where ${libgcj} is specified. Assert that boehm-gc is supported when requested for Objective-C. Only build boehm-gc if needed either for Java or Objective-C. * configure: Regenerate. 2006-06-05 Paolo Bonzini <bonzini@gnu.org> PR 27674 * Makefile.tpl (configure-[+prefix+][+module+], all-[+prefix+][+module+]): Depend on stage_current if bootstrapping. Remove rule to unstage bootstrapped modules. (stage_current): New. * Makefile.in: Regenerate. 2006-05-20 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> Andreas Tobler <a.tobler@schweiz.ch> * configure.in: Enable libgcj for hppa*-hp-hpux11*. * configure: Rebuilt. Revert 2006-01-31 Richard Guenther <rguenther@suse.de> Paolo Bonzini <bonzini@gnu.org> * Makefile.def (target_modules): Add libgcc-math target module. * configure.in (target_libraries): Add libgcc-math target library. (--enable-libgcc-math): New configure switch. * Makefile.in: Re-generate. * configure: Re-generate.
Diffstat (limited to 'Makefile.tpl')
-rw-r--r--Makefile.tpl25
1 files changed, 13 insertions, 12 deletions
diff --git a/Makefile.tpl b/Makefile.tpl
index e3abcb1..8f1a7bc 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -720,14 +720,12 @@ TAGS: do-TAGS
[+ DEFINE configure +]
.PHONY: configure-[+prefix+][+module+] maybe-configure-[+prefix+][+module+]
maybe-configure-[+prefix+][+module+]:
+@if gcc-bootstrap
+configure-[+prefix+][+module+]: stage_current
+@endif gcc-bootstrap
@if [+prefix+][+module+]
maybe-configure-[+prefix+][+module+]: configure-[+prefix+][+module+]
-configure-[+prefix+][+module+]: [+ IF bootstrap +]
-@endif [+prefix+][+module+]
-@if [+prefix+][+module+]-bootstrap
- @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif [+prefix+][+module+]-bootstrap
-@if [+prefix+][+module+][+ ELSE bootstrap +]
+configure-[+prefix+][+module+]: [+ IF bootstrap +][+ ELSE +]
@: $(MAKE); $(unstage)[+ ENDIF bootstrap +]
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -811,16 +809,14 @@ configure-stage[+id+]-[+prefix+][+module+]:
[+ DEFINE all +]
.PHONY: all-[+prefix+][+module+] maybe-all-[+prefix+][+module+]
maybe-all-[+prefix+][+module+]:
+@if gcc-bootstrap
+all-[+prefix+][+module+]: stage_current
+@endif gcc-bootstrap
@if [+prefix+][+module+]
TARGET-[+prefix+][+module+]=[+
IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
maybe-all-[+prefix+][+module+]: all-[+prefix+][+module+]
-all-[+prefix+][+module+]: configure-[+prefix+][+module+][+ IF bootstrap +]
-@endif [+prefix+][+module+]
-@if [+prefix+][+module+]-bootstrap
- @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif [+prefix+][+module+]-bootstrap
-@if [+prefix+][+module+][+ ELSE bootstrap +]
+all-[+prefix+][+module+]: configure-[+prefix+][+module+][+ IF bootstrap +][+ ELSE +]
@: $(MAKE); $(unstage)[+ ENDIF bootstrap +]
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -1429,6 +1425,11 @@ do-distclean: distclean-stage1
stage_last:
$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
+# Same as unstage, but not phony and defaulting to stage1-start. We place
+# it in the dependency so that for example `make -j3 all-gcc' works.
+stage_current:
+ @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+
.PHONY: restrap
restrap:
@: $(MAKE); $(stage)