diff options
| author | ru <ru@FreeBSD.org> | 2002-02-08 13:09:08 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-02-08 13:09:08 +0000 |
| commit | fe2d1dffd326d27189f73fd3c69e407beecc937c (patch) | |
| tree | 17aadb5f893f0f206b7ca0960b604e0d209b43ba | |
| parent | 3592b29f5e399a83c9eb6d700c92cac4083bf2ef (diff) | |
| download | FreeBSD-src-fe2d1dffd326d27189f73fd3c69e407beecc937c.zip FreeBSD-src-fe2d1dffd326d27189f73fd3c69e407beecc937c.tar.gz | |
FreeBSD 4.1 bootstrapping aid (setproctitle(3) is in -lutil).
This backs out (sort of) delta 1.18 to perl/miniperl/Makefile.
Update to the ld(1) comment by peter in this revision:
ld(1) built as part of the cross-tools stage of buildworld has
been fixed to look for dynamic dependencies in the right place,
${WORLDTMP}/usr/lib, effective binutils/ld/Makefile,v 1.20.
Approved by: markm
| -rw-r--r-- | Makefile.inc1 | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/miniperl/Makefile | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 0b1bf26..6c104d4 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -189,7 +189,7 @@ BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ TMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 +TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING # cross-tool stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile index 668568f..8774e29 100644 --- a/gnu/usr.bin/perl/miniperl/Makefile +++ b/gnu/usr.bin/perl/miniperl/Makefile @@ -10,6 +10,13 @@ SRCS+= perl.c gv.c toke.c perly.c op.c regcomp.c dump.c util.c mg.c \ CFLAGS+=-I${.OBJDIR} -I${PERL5SRC} -DPERL_EXTERNAL_GLOB -DPERL_CORE DPADD= ${LIBM} ${LIBCRYPT} LDADD= -lm -lcrypt + +# In FreeBSD 4.0, setproctitle(3) is in -lutil. +.if defined(BOOTSTRAPPING) +DPADD+= ${LIBUTIL} +LDADD+= -lutil +.endif + # Miniperl _must_ be static!! NOSHARED= yes |
