Mon Dec 14 01:18:20 2009 UTC ()
Merge from matt-nb5-mips64


(matt)
diff -r1.8 -r1.9 src/lib/libpam/libpam/Makefile

cvs diff -r1.8 -r1.9 src/lib/libpam/libpam/Makefile (expand / switch to context diff)
--- src/lib/libpam/libpam/Makefile 2008/10/26 07:44:12 1.8
+++ src/lib/libpam/libpam/Makefile 2009/12/14 01:18:20 1.9
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/10/26 07:44:12 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2009/12/14 01:18:20 matt Exp $
 #-
 # Copyright (c) 1998 Juniper Networks, Inc.
 # All rights reserved.
@@ -184,8 +184,8 @@
 # XXX Using ${.ALLSRC} in the ld command causes openpam_static.c to be
 # XXX used.  Why??!!  --thorpej
 openpam_static_modules.o: openpam_static.o ${STATIC_MODULE_LIBS}
-	${LD} -o ${.TARGET} -r --whole-archive openpam_static.o \
-	    ${STATIC_MODULE_LIBS}
+	${CC} ${LDFLAGS} -nostdlib -o ${.TARGET} -r -Wl,--whole-archive \
+	    openpam_static.o ${STATIC_MODULE_LIBS}
 
 .include <bsd.lib.mk>
 .PATH.h: ${DIST}/include