From e11283f1b4f17d4d045a10a315cb47453ffcc927 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 26 Apr 2004 12:08:07 +0000 Subject: Makefile.def (host_modules): Mark with the bootstrap flag packages on which gcc depends. 2004-04-26 Paolo Bonzini * Makefile.def (host_modules): Mark with the bootstrap flag packages on which gcc depends. * Makefile.tpl (all-bootstrap): Use it. * Makefile.in: Regenerate. From-SVN: r81185 --- ChangeLog | 7 +++++++ Makefile.def | 18 +++++++++--------- Makefile.in | 2 +- Makefile.tpl | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a3f1f6..3411ed5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2004-04-26 Paolo Bonzini + * Makefile.def (host_modules): Mark with the bootstrap + flag packages on which gcc depends. + * Makefile.tpl (all-bootstrap): Use it. + * Makefile.in: Regenerate. + +2004-04-26 Paolo Bonzini + * Makefile.def (flags_to_pass): Remove *dir variables that are passed to the modules via TOPLEVEL_CONFIGURE_ARGUMENTS, as well as prefix and exec_prefix. diff --git a/Makefile.def b/Makefile.def index e257634..6e16470 100644 --- a/Makefile.def +++ b/Makefile.def @@ -32,9 +32,9 @@ host_modules= { module= automake; }; host_modules= { module= bash; }; host_modules= { module= bfd; }; host_modules= { module= opcodes; }; -host_modules= { module= binutils; }; -host_modules= { module= bison; no_check_cross= true; }; -host_modules= { module= byacc; no_check_cross= true; }; +host_modules= { module= binutils; bootstrap=true; }; +host_modules= { module= bison; no_check_cross= true; bootstrap=true; }; +host_modules= { module= byacc; no_check_cross= true; bootstrap=true; }; host_modules= { module= bzip2; }; host_modules= { module= dejagnu; }; host_modules= { module= diff; }; @@ -45,7 +45,7 @@ host_modules= { module= fileutils; }; host_modules= { module= findutils; }; host_modules= { module= find; }; host_modules= { module= flex; no_check_cross= true; }; -host_modules= { module= gas; }; +host_modules= { module= gas; bootstrap=true; }; host_modules= { module= gawk; }; host_modules= { module= gettext; }; host_modules= { module= gnuserv; }; @@ -53,13 +53,13 @@ host_modules= { module= gprof; }; host_modules= { module= gzip; }; host_modules= { module= hello; }; host_modules= { module= indent; }; -host_modules= { module= intl; }; +host_modules= { module= intl; bootstrap=true; }; host_modules= { module= tcl; missing=mostlyclean; }; host_modules= { module= itcl; }; -host_modules= { module= ld; }; +host_modules= { module= ld; bootstrap=true; }; host_modules= { module= libgui; }; -host_modules= { module= libiberty; }; +host_modules= { module= libiberty; bootstrap=true; }; host_modules= { module= libtool; }; host_modules= { module= m4; }; host_modules= { module= make; }; @@ -77,13 +77,13 @@ host_modules= { module= shellutils; }; host_modules= { module= sid; }; host_modules= { module= sim; }; host_modules= { module= tar; }; -host_modules= { module= texinfo; no_install= true; }; +host_modules= { module= texinfo; no_install= true; bootstrap=true; }; host_modules= { module= textutils; }; host_modules= { module= time; }; host_modules= { module= uudecode; }; host_modules= { module= wdiff; }; host_modules= { module= zip; no_check_cross=true; }; -host_modules= { module= zlib; no_install=true; no_check=true; }; +host_modules= { module= zlib; no_install=true; no_check=true; bootstrap=true; }; host_modules= { module= gdb; with_x=true; }; host_modules= { module= expect; with_x=true; }; host_modules= { module= guile; with_x=true; }; diff --git a/Makefile.in b/Makefile.in index d8c0157..29e7cd1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24324,7 +24324,7 @@ all-gcc: maybe-all-libiberty maybe-all-intl maybe-all-bison maybe-all-byacc mayb # This is a slightly kludgy method of getting dependencies on # all-build-libiberty correct; it would be better to build it every time. all-gcc: maybe-all-build-libiberty -all-bootstrap: maybe-all-libiberty maybe-all-intl maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib +all-bootstrap: maybe-all-binutils maybe-all-bison maybe-all-byacc maybe-all-gas maybe-all-intl maybe-all-ld maybe-all-libiberty maybe-all-texinfo maybe-all-zlib # Host modules specific to gdb. # GDB needs to know that the simulator is being built. diff --git a/Makefile.tpl b/Makefile.tpl index 2d767a7..18d55f2 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -1604,7 +1604,7 @@ all-gcc: maybe-all-libiberty maybe-all-intl maybe-all-bison maybe-all-byacc mayb # This is a slightly kludgy method of getting dependencies on # all-build-libiberty correct; it would be better to build it every time. all-gcc: maybe-all-build-libiberty -all-bootstrap: maybe-all-libiberty maybe-all-intl maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib +all-bootstrap: [+ FOR host_modules +][+ IF bootstrap +]maybe-all-[+module+] [+ ENDIF bootstrap +][+ ENDFOR host_modules +] # Host modules specific to gdb. # GDB needs to know that the simulator is being built. -- cgit v1.1