Remove the bootstrap-rtld target which wasn't needed.

Install the rest of the legacy libraries (like libgcc.a, libl.a).

Add games to the user's path to avoid the temptation for people to
hack paths to unsuitable tools.
This commit is contained in:
John Birrell 1998-09-21 08:55:50 +00:00
parent 608c9e3cf8
commit b510e4c210

View File

@ -1,5 +1,5 @@
#
# $Id: Makefile.inc1,v 1.16 1998/09/17 09:34:51 phk Exp $
# $Id: Makefile.inc1,v 1.17 1998/09/17 16:32:00 andreas Exp $
#
# Make command line options:
# -DCLOBBER will remove /usr/include
@ -174,8 +174,8 @@ PATH= ${TOOLROOT}/sbin:${TOOLROOT}/bin:${TOOLROOT}/usr/sbin:${TOOLROOT}/usr/bin
.else
TOOLROOT= ${WORLDTMP}
.endif
STRICTTMPPATH= ${TOOLROOT}/sbin:${TOOLROOT}/usr/sbin:${TOOLROOT}/bin:${TOOLROOT}/usr/bin
TMPPATH= ${STRICTTMPPATH}:${PATH}
STRICTTMPPATH= ${TOOLROOT}/sbin:${TOOLROOT}/usr/sbin:${TOOLROOT}/bin:${TOOLROOT}/usr/bin:${TOOLROOT}/usr/games
TMPPATH= ${STRICTTMPPATH}:${PATH}:/usr/games
# XXX COMPILER_PATH is needed for finding cc1, ld and as
# XXX GCC_EXEC_PREFIX is for *crt.o. It is probably unnecessary now
@ -697,25 +697,6 @@ bootstrap-libraries:
.endif
.endfor
#
# bootstrap-rtld - Build the shared library loader and install it
# under ${WORLDTMP}. This requires libc_pic which isn't normally
# bootstrapped, so libc has to be built again. *sigh*
#
RTLD_MK_FLAGS= -DNOINFO -DNOMAN -DNOPROFILE
bootstrap-rtld:
.if exists(${.CURDIR}/libexec/rtld-${OBJFORMAT})
cd ${.CURDIR}/lib/libc; \
${MAKE} ${RTLD_MK_FLAGS} ${_DEPEND}; \
${MAKE} ${RTLD_MK_FLAGS} all; \
${MAKE} ${RTLD_MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
cd ${.CURDIR}/libexec/rtld-${OBJFORMAT}; \
${MAKE} obj; \
${MAKE} ${RTLD_MK_FLAGS} ${_DEPEND}; \
${MAKE} ${RTLD_MK_FLAGS} all; \
${MAKE} ${RTLD_MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
.endif
#
# libraries - build all libraries, and install them under ${DESTDIR}.
#
@ -921,6 +902,19 @@ legacy-install:
@echo "--------------------------------------------------------------"
cd ${.CURDIR}/lib; ${MAKE} -B -DNOMAN -DNOINFO install
cd ${.CURDIR}/gnu/lib; ${MAKE} -B -DNOMAN -DNOINFO install
cd ${.CURDIR}/gnu/usr.bin/cc/libgcc; \
${MAKE} -B -DNOMAN -DNOINFO install
cd ${.CURDIR}/usr.bin/lex/lib; \
${MAKE} -B -DNOMAN -DNOINFO install
cd ${.CURDIR}/usr.sbin/pcvt/keycap; \
${MAKE} -B -DNOMAN -DNOINFO install
.if exists(${.CURDIR}/secure/lib) && !defined(NOCRYPT) && !defined(NOSECURE)
cd ${.CURDIR}/secure/lib; ${MAKE} -B -DNOMAN -DNOINFO install
.endif
.if exists(${.CURDIR}/kerberosIV/lib) && !defined(NOCRYPT) && \
defined(MAKE_KERBEROS4)
cd ${.CURDIR}/kerberosIV/lib; ${MAKE} -B -DNOMAN -DNOINFO install
.endif
@echo
@echo "--------------------------------------------------------------"
@echo ">>> Installing legacy rtld"