This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

all-gcc should depend on maybe-all-{flex,texinfo}


Since gcc configure is going to set things up to use flex from the
build tree if it finds flex sources in the source tree, we need this
dependency.  In general, if you have a unified tree, you won't run
into a problem because gcc depends on ld, that depends on flex.  But
if you happen to disable ld, or if it's not supported on your
platform, you end up without the dependency, and lose.

This patch fixes it, while at the same time fixing the incompatibility
between the dependencies of all-gcc and all-bootstrap.  Hmm...  Maybe
we could generate the all-gcc deps in the same way we generate the
all-bootstrap ones?  Does it seem to make sense to anyone like it does
to me?

I'm checking this in gcc mainline and src.

Index: ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	* Makefile.def (host_modules): Set bootstrap=true for flex.
	* Makefile.tpl (all-gcc): Depend on texinfo and flex.
	* Makefile.in: Rebuilt.

Index: Makefile.def
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.def,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile.def
--- Makefile.def 2 Jul 2004 07:55:35 -0000 1.28
+++ Makefile.def 8 Jul 2004 19:28:57 -0000
@@ -50,7 +50,7 @@ host_modules= { module= fastjar; no_chec
 host_modules= { module= fileutils; };
 host_modules= { module= findutils; };
 host_modules= { module= find; };
-host_modules= { module= flex; no_check_cross= true; };
+host_modules= { module= flex; no_check_cross= true; bootstrap=true; };
 host_modules= { module= gas; bootstrap=true; };
 host_modules= { module= gawk; };
 host_modules= { module= gettext; };
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.in,v
retrieving revision 1.228
diff -u -p -r1.228 Makefile.in
--- Makefile.in 2 Jul 2004 07:55:35 -0000 1.228
+++ Makefile.in 8 Jul 2004 19:29:03 -0000
@@ -29195,13 +29195,13 @@ all-build-m4: maybe-all-build-libiberty 
 # GCC needs to identify certain tools.
 # GCC also needs the information exported by the intl configure script.
 configure-gcc: maybe-configure-intl maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex
-all-gcc: maybe-all-libiberty maybe-all-intl maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib maybe-all-libbanshee maybe-all-libcpp
+all-gcc: maybe-all-libiberty maybe-all-intl maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-flex maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib maybe-all-libbanshee maybe-all-libcpp
 configure-libcpp: maybe-configure-libiberty maybe-configure-intl
 all-libcpp: maybe-all-libiberty maybe-all-intl
 # 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-binutils maybe-all-bison maybe-all-byacc maybe-all-gas maybe-all-intl maybe-all-ld maybe-all-libcpp maybe-all-libbanshee maybe-all-libiberty maybe-all-texinfo maybe-all-zlib 
+all-bootstrap: maybe-all-binutils maybe-all-bison maybe-all-byacc maybe-all-flex maybe-all-gas maybe-all-intl maybe-all-ld maybe-all-libcpp maybe-all-libbanshee maybe-all-libiberty maybe-all-texinfo maybe-all-zlib 
 
 # Host modules specific to gdb.
 # GDB needs to know that the simulator is being built.
Index: Makefile.tpl
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile.tpl
--- Makefile.tpl 2 Jul 2004 07:55:36 -0000 1.106
+++ Makefile.tpl 8 Jul 2004 19:29:04 -0000
@@ -1675,7 +1675,7 @@ all-build-m4: maybe-all-build-libiberty 
 # GCC needs to identify certain tools.
 # GCC also needs the information exported by the intl configure script.
 configure-gcc: maybe-configure-intl maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex
-all-gcc: maybe-all-libiberty maybe-all-intl maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib maybe-all-libbanshee maybe-all-libcpp
+all-gcc: maybe-all-libiberty maybe-all-intl maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-flex maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib maybe-all-libbanshee maybe-all-libcpp
 configure-libcpp: maybe-configure-libiberty maybe-configure-intl
 all-libcpp: maybe-all-libiberty maybe-all-intl
 # This is a slightly kludgy method of getting dependencies on 
-- 
Alexandre Oliva             http://www.ic.unicamp.br/~oliva/
Red Hat Compiler Engineer   aoliva@{redhat.com, gcc.gnu.org}
Free Software Evangelist  oliva@{lsd.ic.unicamp.br, gnu.org}

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]