mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
Move tsort back to lib-tools where it belongs, and add a "specially
for bootstrap" tweak to the lex Makefile to stop it building the library too early. This untangles things a bit more, it stops new bootstraps failing because libl/libfl uses 'ld -O' before ld is updated.
This commit is contained in:
parent
e326fc73b9
commit
2f15594269
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=17467
8
Makefile
8
Makefile
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# $Id: Makefile,v 1.93 1996/08/03 13:00:35 jkh Exp $
|
||||
# $Id: Makefile,v 1.94 1996/08/07 13:21:43 peter Exp $
|
||||
#
|
||||
# Make command line options:
|
||||
# -DCLOBBER will remove /usr/include
|
||||
|
@ -342,10 +342,8 @@ bootstrap:
|
|||
${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
|
||||
cd ${.CURDIR}/usr.bin/xinstall && ${MAKE} depend && \
|
||||
${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
|
||||
cd ${.CURDIR}/usr.bin/tsort && ${MAKE} depend && \
|
||||
${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
|
||||
cd ${.CURDIR}/usr.bin/lex && ${MAKE} bootstrap && ${MAKE} depend && \
|
||||
${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
|
||||
${MAKE} ${MK_FLAGS} -DNOLIB all install ${CLEANDIR} ${OBJDIR}
|
||||
|
||||
#
|
||||
# include-tools - generally the same as 'bootstrap', except that it's for
|
||||
|
@ -401,6 +399,8 @@ includes:
|
|||
# lib-tools - build tools to compile and install the libraries.
|
||||
#
|
||||
lib-tools:
|
||||
cd ${.CURDIR}/usr.bin/tsort && ${MAKE} depend && \
|
||||
${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
|
||||
cd ${.CURDIR}/gnu/usr.bin/ld && ${MAKE} depend && \
|
||||
${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
|
||||
cd ${.CURDIR}/usr.bin/ar && ${MAKE} depend && \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: Makefile,v 1.4 1996/05/07 23:19:47 wosch Exp $
|
||||
# $Id: Makefile,v 1.5 1996/06/19 20:46:57 nate Exp $
|
||||
#
|
||||
# By default, flex will be configured to generate 8-bit scanners only if the
|
||||
# -8 flag is given. If you want it to always generate 8-bit scanners, add
|
||||
|
@ -26,8 +26,9 @@ MLINKS+= lex.1 lex++.1
|
|||
|
||||
CLEANFILES+= parse.c parse.h scan.c y.tab.h y.tab.c
|
||||
|
||||
|
||||
.if !defined(NOLIB)
|
||||
SUBDIR= lib
|
||||
.endif
|
||||
|
||||
beforeinstall:
|
||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 644 \
|
||||
|
|
Loading…
Reference in a new issue