From 0684862401b9582e58015407125970f7036459f8 Mon Sep 17 00:00:00 2001 From: bde Date: Mon, 27 Mar 2000 15:58:53 +0000 Subject: [PATCH] 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$). --- gnu/usr.bin/perl/perl/Makefile | 5 ++--- 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 141209ee0437..dea537108fab 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 351f7c4f9aa8..3324c81ea677 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