diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.def | 9 | ||||
| -rw-r--r-- | Makefile.in | 85 |
3 files changed, 40 insertions, 60 deletions
@@ -1,3 +1,9 @@ +2005-05-20 Paolo Bonzini <bonzini@gnu.org> + + * Makefile.def (configure-gcc): Depend on binutils having been built. + (all-gcc): No need to do it here. + * Makefile.in: Regenerate. + 2005-05-19 Paul Brook <paul@codesourcery.com> * configure.in: Rewrite misleading error message when requested diff --git a/Makefile.def b/Makefile.def index e338aa8..091b869 100644 --- a/Makefile.def +++ b/Makefile.def @@ -242,9 +242,9 @@ dependencies = { module=all-build-fixincludes; on=all-build-libiberty; }; // Host modules specific to gcc. dependencies = { module=configure-gcc; on=configure-intl; }; -dependencies = { module=configure-gcc; on=configure-binutils; }; -dependencies = { module=configure-gcc; on=configure-gas; }; -dependencies = { module=configure-gcc; on=configure-ld; }; +dependencies = { module=configure-gcc; on=all-binutils; }; +dependencies = { module=configure-gcc; on=all-gas; }; +dependencies = { module=configure-gcc; on=all-ld; }; dependencies = { module=all-gcc; on=all-libiberty; hard=true; }; dependencies = { module=all-gcc; on=all-intl; }; dependencies = { module=all-gcc; on=all-build-texinfo; }; @@ -253,9 +253,6 @@ dependencies = { module=all-gcc; on=all-build-byacc; }; dependencies = { module=all-gcc; on=all-build-flex; }; dependencies = { module=all-gcc; on=all-build-libiberty; }; dependencies = { module=all-gcc; on=all-build-fixincludes; }; -dependencies = { module=all-gcc; on=all-binutils; }; -dependencies = { module=all-gcc; on=all-gas; }; -dependencies = { module=all-gcc; on=all-ld; }; dependencies = { module=all-gcc; on=all-zlib; }; dependencies = { module=all-gcc; on=all-libcpp; hard=true; }; dependencies = { module=all-gcc; on=all-libiberty; }; diff --git a/Makefile.in b/Makefile.in index 7d6a559..1e08092 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33414,7 +33414,7 @@ stage1-start:: @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stage1 > stage_current ; \ echo stage1 > stage_last; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR) @if bfd @cd $(HOST_SUBDIR); [ -d stage1-bfd ] || \ mkdir stage1-bfd; \ @@ -33557,7 +33557,7 @@ stage2-start:: @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stage2 > stage_current ; \ echo stage2 > stage_last; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR) @if bfd @cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \ mkdir stage2-bfd; \ @@ -33743,7 +33743,7 @@ stage3-start:: @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stage3 > stage_current ; \ echo stage3 > stage_last; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR) @if bfd @cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \ mkdir stage3-bfd; \ @@ -33960,7 +33960,7 @@ stage4-start:: @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stage4 > stage_current ; \ echo stage4 > stage_last; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR) @if bfd @cd $(HOST_SUBDIR); [ -d stage4-bfd ] || \ mkdir stage4-bfd; \ @@ -34174,7 +34174,7 @@ stageprofile-start:: @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stageprofile > stage_current ; \ echo stageprofile > stage_last; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR) @if bfd @cd $(HOST_SUBDIR); [ -d stageprofile-bfd ] || \ mkdir stageprofile-bfd; \ @@ -34357,7 +34357,7 @@ stagefeedback-start:: @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stagefeedback > stage_current ; \ echo stagefeedback > stage_last; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR) @if bfd @cd $(HOST_SUBDIR); [ -d stagefeedback-bfd ] || \ mkdir stagefeedback-bfd; \ @@ -34654,6 +34654,7 @@ configure-target-qthreads: maybe-all-target-newlib maybe-all-target-libgloss + # With all the machinery above in place, it is pretty easy to generate # dependencies. Host dependencies are a bit more complex because we have # to check for bootstrap/prebootstrap dependencies. To resolve @@ -34676,30 +34677,30 @@ configure-stage3-gcc: maybe-configure-stage3-intl configure-stage4-gcc: maybe-configure-stage4-intl configure-stageprofile-gcc: maybe-configure-stageprofile-intl configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl -configure-gcc: maybe-configure-binutils - -configure-stage1-gcc: maybe-configure-stage1-binutils -configure-stage2-gcc: maybe-configure-stage2-binutils -configure-stage3-gcc: maybe-configure-stage3-binutils -configure-stage4-gcc: maybe-configure-stage4-binutils -configure-stageprofile-gcc: maybe-configure-stageprofile-binutils -configure-stagefeedback-gcc: maybe-configure-stagefeedback-binutils -configure-gcc: maybe-configure-gas - -configure-stage1-gcc: maybe-configure-stage1-gas -configure-stage2-gcc: maybe-configure-stage2-gas -configure-stage3-gcc: maybe-configure-stage3-gas -configure-stage4-gcc: maybe-configure-stage4-gas -configure-stageprofile-gcc: maybe-configure-stageprofile-gas -configure-stagefeedback-gcc: maybe-configure-stagefeedback-gas -configure-gcc: maybe-configure-ld - -configure-stage1-gcc: maybe-configure-stage1-ld -configure-stage2-gcc: maybe-configure-stage2-ld -configure-stage3-gcc: maybe-configure-stage3-ld -configure-stage4-gcc: maybe-configure-stage4-ld -configure-stageprofile-gcc: maybe-configure-stageprofile-ld -configure-stagefeedback-gcc: maybe-configure-stagefeedback-ld +configure-gcc: maybe-all-binutils + +configure-stage1-gcc: maybe-all-stage1-binutils +configure-stage2-gcc: maybe-all-stage2-binutils +configure-stage3-gcc: maybe-all-stage3-binutils +configure-stage4-gcc: maybe-all-stage4-binutils +configure-stageprofile-gcc: maybe-all-stageprofile-binutils +configure-stagefeedback-gcc: maybe-all-stagefeedback-binutils +configure-gcc: maybe-all-gas + +configure-stage1-gcc: maybe-all-stage1-gas +configure-stage2-gcc: maybe-all-stage2-gas +configure-stage3-gcc: maybe-all-stage3-gas +configure-stage4-gcc: maybe-all-stage4-gas +configure-stageprofile-gcc: maybe-all-stageprofile-gas +configure-stagefeedback-gcc: maybe-all-stagefeedback-gas +configure-gcc: maybe-all-ld + +configure-stage1-gcc: maybe-all-stage1-ld +configure-stage2-gcc: maybe-all-stage2-ld +configure-stage3-gcc: maybe-all-stage3-ld +configure-stage4-gcc: maybe-all-stage4-ld +configure-stageprofile-gcc: maybe-all-stageprofile-ld +configure-stagefeedback-gcc: maybe-all-stagefeedback-ld all-gcc: all-libiberty all-stage1-gcc: all-stage1-libiberty @@ -34770,30 +34771,6 @@ all-stage4-gcc: maybe-all-build-fixincludes all-stageprofile-gcc: maybe-all-build-fixincludes all-stagefeedback-gcc: maybe-all-build-fixincludes all-prebootstrap: maybe-all-build-fixincludes -all-gcc: maybe-all-binutils - -all-stage1-gcc: maybe-all-stage1-binutils -all-stage2-gcc: maybe-all-stage2-binutils -all-stage3-gcc: maybe-all-stage3-binutils -all-stage4-gcc: maybe-all-stage4-binutils -all-stageprofile-gcc: maybe-all-stageprofile-binutils -all-stagefeedback-gcc: maybe-all-stagefeedback-binutils -all-gcc: maybe-all-gas - -all-stage1-gcc: maybe-all-stage1-gas -all-stage2-gcc: maybe-all-stage2-gas -all-stage3-gcc: maybe-all-stage3-gas -all-stage4-gcc: maybe-all-stage4-gas -all-stageprofile-gcc: maybe-all-stageprofile-gas -all-stagefeedback-gcc: maybe-all-stagefeedback-gas -all-gcc: maybe-all-ld - -all-stage1-gcc: maybe-all-stage1-ld -all-stage2-gcc: maybe-all-stage2-ld -all-stage3-gcc: maybe-all-stage3-ld -all-stage4-gcc: maybe-all-stage4-ld -all-stageprofile-gcc: maybe-all-stageprofile-ld -all-stagefeedback-gcc: maybe-all-stagefeedback-ld all-gcc: maybe-all-zlib all-stage1-gcc: maybe-all-stage1-zlib |