summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2000-06-25 15:02:18 +0000
committermarkm <markm@FreeBSD.org>2000-06-25 15:02:18 +0000
commit03f53f17a26c442c42c7c772a7df667520513922 (patch)
tree350de34ebd8a59ed02d26b41985ebbc622715037 /Makefile.inc1
parenta3bfce565b199a20509af7b13c74cc73a67d1b68 (diff)
downloadFreeBSD-src-03f53f17a26c442c42c7c772a7df667520513922.zip
FreeBSD-src-03f53f17a26c442c42c7c772a7df667520513922.tar.gz
Rearrange Perl's build priority; it needs to get made earlier.
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc112
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 5fcf97f..cbf7492 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -159,7 +159,7 @@ CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \
COMPILER_PATH=${WORLDTMP}/usr/libexec:${WORLDTMP}/usr/bin \
LIBRARY_PATH=${WORLDTMP}${SHLIBDIR}:${WORLDTMP}/usr/lib \
OBJFORMAT_PATH=${WORLDTMP}/usr/libexec \
- PERL5LIB=${WORLDTMP}/usr/libdata/perl/5.00503
+ PERL5LIB=${WORLDTMP}/usr/libdata/perl/5.006
# bootstrap-tool stage
BMAKEENV= ${BOOTSTRAPENV}
@@ -530,9 +530,13 @@ _libkrb5= kerberos5/lib/libroken kerberos5/lib/libasn1 kerberos5/lib/libhdb \
kerberos5/lib/libsl
.endif
+.if !defined(NOPERL)
+_perl= gnu/usr.bin/perl
+.endif
+
build-tools:
.for _tool in bin/sh ${_games} gnu/usr.bin/cc/cc_tools ${_fortran} \
- ${_libroken4} ${_libkrb5} lib/libncurses ${_share}
+ ${_libroken4} ${_libkrb5} lib/libncurses ${_share} ${_perl}
cd ${.CURDIR}/${_tool}; ${MAKE} build-tools
.endfor
@@ -714,10 +718,6 @@ _libm= lib/libm
_libm= lib/msun
.endif
-.if !defined(NOPERL)
-_libperl= gnu/usr.bin/perl/libperl
-.endif
-
.if ${MACHINE_ARCH} == "i386"
_libkeycap= usr.sbin/pcvt/keycap
.endif
OpenPOWER on IntegriCloud