diff options
| author | bde <bde@FreeBSD.org> | 2000-03-27 15:58:53 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2000-03-27 15:58:53 +0000 |
| commit | 21f9648373f0ef358b3c863a852e4add9508955b (patch) | |
| tree | abfa0b9692876806628e697c63e2c7656d626060 /gnu | |
| parent | c41bd709804471eae8f1ed01e2213fbddb82009a (diff) | |
| download | FreeBSD-src-21f9648373f0ef358b3c863a852e4add9508955b.zip FreeBSD-src-21f9648373f0ef358b3c863a852e4add9508955b.tar.gz | |
Don't abuse LDADD for holding linker flags. Doing so broke
`make checkdpadd'. Linker flags (ones passed via ${CC}) go in
LDFLAGS.
Fixed some style bugs (misformatting of $FreeBSD$).
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/perl/perl/Makefile | 5 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/suidperl/Makefile | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/gnu/usr.bin/perl/perl/Makefile b/gnu/usr.bin/perl/perl/Makefile index 141209e..dea5371 100644 --- a/gnu/usr.bin/perl/perl/Makefile +++ b/gnu/usr.bin/perl/perl/Makefile @@ -1,15 +1,14 @@ -# # $FreeBSD$ -# PROG= perl NOMAN= true CFLAGS+=-I${PERL5SRC} -I${.OBJDIR} SRCS= perlmain.c config.h NOSHARED= no +LDFLAGS=-Wl,-E DYNALOADER= lib/auto/DynaLoader/DynaLoader.a DPADD= ${DYNALOADER} ${LIBPERL} ${LIBM} ${LIBCRYPT} ${LIBMD} ${LIBXPG4} -LDADD= -Wl,-E ${DYNALOADER} -lperl -lm -lcrypt -lmd -lxpg4 +LDADD= ${DYNALOADER} -lperl -lm -lcrypt -lmd -lxpg4 LINKS= ${BINDIR}/${PROG} ${BINDIR}/perl5 \ ${BINDIR}/${PROG} ${BINDIR}/perl5.00503 diff --git a/gnu/usr.bin/perl/suidperl/Makefile b/gnu/usr.bin/perl/suidperl/Makefile index 351f7c4..3324c81 100644 --- a/gnu/usr.bin/perl/suidperl/Makefile +++ b/gnu/usr.bin/perl/suidperl/Makefile @@ -1,15 +1,14 @@ -# # $FreeBSD$ -# PROG= suidperl NOMAN= true CFLAGS+=-I${PERL5SRC} -I${.OBJDIR} -DIAMSUID SRCS= perlmain.c sperl.c config.h NOSHARED= no +LDFLAGS=-Wl,-E DYNALOADER= lib/auto/DynaLoader/DynaLoader.a DPADD= ${DYNALOADER} ${LIBPERL} ${LIBM} ${LIBCRYPT} ${LIBMD} ${LIBXPG4} -LDADD= -Wl,-E ${DYNALOADER} -lperl -lm -lcrypt -lmd -lxpg4 +LDADD= ${DYNALOADER} -lperl -lm -lcrypt -lmd -lxpg4 BINOWN= root BINMODE=4511 LINKS= ${BINDIR}/${PROG} ${BINDIR}/sperl5.00503 |
