summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/perl/Makefile.bsd-wrapper
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2009-10-12 18:24:50 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2009-10-12 18:24:50 +0000
commit7bed5fce775e8466f8c0c970eaeb5071d8a7718c (patch)
treec0c8e293312f13dfe8f57376c94f545c453ced38 /gnu/usr.bin/perl/Makefile.bsd-wrapper
parent4c85db8b5736693bd819a09987f0dc89a9f1c24d (diff)
Merge in perl 5.10.1
Diffstat (limited to 'gnu/usr.bin/perl/Makefile.bsd-wrapper')
-rw-r--r--gnu/usr.bin/perl/Makefile.bsd-wrapper17
1 files changed, 10 insertions, 7 deletions
diff --git a/gnu/usr.bin/perl/Makefile.bsd-wrapper b/gnu/usr.bin/perl/Makefile.bsd-wrapper
index d2a2d228299..65821adc838 100644
--- a/gnu/usr.bin/perl/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/perl/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.78 2008/10/07 22:21:02 martynas Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.79 2009/10/12 18:24:20 millert Exp $
#
# Build wrapper for Perl 5.10.0
#
@@ -33,11 +33,11 @@ H2PH= /usr/bin/h2ph
LIB= perl
SRCS1= gv.c toke.c perly.c pad.c regcomp.c dump.c util.c mg.c reentr.c \
- mro.c hv.c av.c perl.c run.c pp_hot.c sv.c pp.c scope.c pp_ctl.c \
+ mro.c hv.c av.c run.c pp_hot.c sv.c pp.c scope.c pp_ctl.c \
pp_sys.c doop.c doio.c regexec.c utf8.c taint.c deb.c universal.c \
xsutils.c globals.c perlio.c perlapi.c numeric.c mathoms.c locale.c \
pp_pack.c pp_sort.c
-SRCS= ${SRCS1} op.c
+SRCS= ${SRCS1} op.c perl.c
# We must not try to mkdep DynaLoader.c as it requires miniperl
OBJS+= DynaLoader.o
@@ -157,20 +157,23 @@ PICFLAG=-fPIC
.endif
# The DynaLoader extension is now compiled statically into libperl
-miniperl: ${GENERATED} ${SRCS1:S/.c/.o/g} opmini.o miniperlmain.o
- ${CC} -o miniperl ${SRCS1:S/.c/.o/g} opmini.o miniperlmain.o -lm
+miniperl: ${GENERATED} ${SRCS1:S/.c/.o/g} opmini.o miniperl.o miniperlmain.o
+ ${CC} -o miniperl ${SRCS1:S/.c/.o/g} opmini.o miniperl.o miniperlmain.o -lm
opmini.c: op.c
rm -f opmini.c
cp op.c opmini.c
opmini.o: opmini.c
- ${CC} ${CPPFLAGS} ${CFLAGS} -DPERL_EXTERNAL_GLOB -c $< -o $@
+ ${CC} ${CPPFLAGS} ${CFLAGS} -DPERL_EXTERNAL_GLOB -c $> -o $@
+
+miniperl.o: perl.c
+ ${CC} ${CPPFLAGS} ${CFLAGS} -DPERL_EXTERNAL_GLOB -DPERL_IS_MINIPERL -c $> -o $@
lib/Config.pm: miniperl config.sh
cd ${.OBJDIR} && exec ${MAKE} preplibrary
-DynaLoader.c: ${DYNALOADER} lib/Config.pm
+DynaLoader.c: miniperl ${DYNALOADER} lib/Config.pm
./miniperl -Ilib lib/ExtUtils/xsubpp -noprototypes -typemap \
../../lib/ExtUtils/typemap ${DYNALOADER} | \
sed -f ${.CURDIR}/DynaLoader.sed > $@