From 7876f1c58060284e52d7df556230e67ce61da8e5 Mon Sep 17 00:00:00 2001
From: Marc Espie <espie@cvs.openbsd.org>
Date: Thu, 6 Sep 2001 19:09:30 +0000
Subject: Use ${CC} to link ld.so, so that it will grok whatever you throw at
 it in COPTS/DEBUG.

---
 gnu/usr.bin/ld/rtld/Makefile | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'gnu/usr.bin/ld')

diff --git a/gnu/usr.bin/ld/rtld/Makefile b/gnu/usr.bin/ld/rtld/Makefile
index 0dfee53a396..5e9cb210181 100644
--- a/gnu/usr.bin/ld/rtld/Makefile
+++ b/gnu/usr.bin/ld/rtld/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2000/05/25 21:49:02 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 2001/09/06 19:09:29 espie Exp $
 #	$NetBSD: Makefile,v 1.11 1995/10/09 00:11:24 pk Exp $
 
 PROG=	ld.so
@@ -10,21 +10,13 @@ LDDIR?= $(.CURDIR)/..
 # As there is relocation going on behind GCC's back, don't cache function addresses.
 PICFLAG=-fpic -fno-function-cse
 CFLAGS+=-I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE_ARCH) $(PICFLAG) -DRTLD -DLIBC_SCCS
-LDFLAGS+=-Bshareable -Bsymbolic -assert nosymbolic
+LDFLAGS+=-nostartfiles -nostdlib -Wl,-Bshareable,-Bsymbolic,-assert,nosymbolic
 ASFLAGS+=-k
 LDADD+=	-lc_pic
 BINDIR= /usr/libexec
 
 .PATH: $(LDDIR) $(LDDIR)/$(MACHINE_ARCH) ${.CURDIR}/../../../../lib/libc/stdio
 
-.if defined(DESTDIR)
-$(PROG):
-	$(LD) -o $(PROG) $(LDFLAGS) -nostdlib -L${DESTDIR}/usr/lib $(OBJS) $(LDADD)
-.else
-$(PROG):
-	$(LD) -o $(PROG) $(LDFLAGS) $(OBJS) $(LDADD)
-.endif
-
 .S.o:
 	${CPP} ${.IMPSRC} | ${AS} ${ASFLAGS} -o ${.TARGET} -
 
-- 
cgit v1.2.3