diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2002-02-08 13:09:08 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2002-02-08 13:09:08 +0000 |
| commit | fac6ec1f62409c76b2b14d0dc19071ec5851114f (patch) | |
| tree | 17aadb5f893f0f206b7ca0960b604e0d209b43ba | |
| parent | 4525f3a803c3920cca9a9803d77d3f8171c5c67c (diff) | |
| download | src-fac6ec1f62409c76b2b14d0dc19071ec5851114f.tar.gz src-fac6ec1f62409c76b2b14d0dc19071ec5851114f.zip | |
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
Notes
Notes:
svn path=/head/; revision=90402
| -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 0b1bf26cd31a..6c104d46d607 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 668568f64768..8774e29dc131 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 |