diff options
| author | obrien <obrien@FreeBSD.org> | 1999-03-31 06:38:13 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-03-31 06:38:13 +0000 |
| commit | a6dc8c5afd855c4e7c971aec2e3768e318aa52eb (patch) | |
| tree | e2c529a00ff968741760d94f48bc635261c2ef96 /Makefile.inc1 | |
| parent | c901bebef2d9431ee8379a75aeebbb08cbc0cccf (diff) | |
| download | FreeBSD-src-a6dc8c5afd855c4e7c971aec2e3768e318aa52eb.zip FreeBSD-src-a6dc8c5afd855c4e7c971aec2e3768e318aa52eb.tar.gz | |
* Deal with libgcc's move from gnu/usr.bin/cc to gnu/lib.
Move was necessary as libgcc should be built with the freshly built
compiler and thus we must wait until the freshly built bits have been
installed somewhere so we can use them. libgcc presence in gnu/usr.bin/cc/
gets in the way of building the new compiler. We could have either
cd'ed to specific directories w/in gnu/usr.bin/cc/ and built and installed
individual bits, or move libgcc out of the way and let our normal subdir
building process work.
* Don't build libgcc in "bootstrap-libraries:" target it should not be
assumed the currently installed compiler can correctly build libgcc.
(as is the case for g++ 2.7.2 and EGCS' libgcc)
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index c79bec3..d7685e7 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,5 +1,5 @@ # -# $Id: Makefile.inc1,v 1.64 1999/02/27 03:18:10 jkh Exp $ +# $Id: Makefile.inc1,v 1.65 1999/03/01 01:09:06 imp Exp $ # # Make command line options: # -DCLOBBER will remove /usr/include @@ -599,7 +599,17 @@ lib-tools: usr.bin/tsort \ ${_aout_as} \ gnu/usr.bin/bison \ - gnu/usr.bin/cc \ + gnu/usr.bin/cc + cd ${.CURDIR}/$d; ${MAKE} ${MK_FLAGS} ${_DEPEND}; \ + ${MAKE} ${MK_FLAGS} all; \ + ${MAKE} ${MK_FLAGS} -B install; \ + ${MAKE} ${MK_FLAGS:S/-DNOPIC//} -B ${CLEANDIR} ${OBJDIR} +.endfor + cd ${.CURDIR}/gnu/lib/libgcc; ${MAKE} ${MK_FLAGS} ${_DEPEND}; \ + ${MAKE} ${MK_FLAGS} all; \ + ${MAKE} ${MK_FLAGS} -B install; \ + ${MAKE} ${MK_FLAGS:S/-DNOPIC//} -B ${CLEANDIR} ${OBJDIR} +.for d in \ ${_aout_ar} \ usr.bin/env \ usr.bin/lex/lib \ @@ -673,8 +683,8 @@ _libperl= gnu/usr.bin/perl/libperl # bootstrap-libraries - build just enough libraries for the bootstrap # tools, and install them under ${WORLDTMP}. # -# Build csu and libgcc early so that some tools get linked to the new -# versions (too late for the main tools, however). Then build the +# Build csu early so that some tools get linked to the new +# version (too late for the main tools, however). Then build the # necessary prerequisite libraries (libtermcap just needs to be before # libcurses, and this only matters for the NOCLEAN case when NOPIC is # not set). @@ -685,7 +695,7 @@ _libperl= gnu/usr.bin/perl/libperl # host. # bootstrap-libraries: -.for _lib in ${_csu} gnu/usr.bin/cc/libgcc lib/libtermcap \ +.for _lib in ${_csu} lib/libtermcap \ gnu/lib/libregex gnu/lib/libreadline lib/libc \ lib/libcrypt lib/libcurses lib/libedit ${_libm} \ lib/libmd lib/libutil lib/libz usr.bin/lex/lib \ |
