From f1e0ecadf751d8f48b63f561d1c5d00e612f4c82 Mon Sep 17 00:00:00 2001
From: dbj <dbj@NetBSD.org>
Date: Wed, 14 May 2003 00:24:06 +0000
Subject: [PATCH] remove dependencies on ${LIBC} ${LIBM} and ${LIBTERMCAP}
 static libraries from host tool targets.  Commits fix from PR toolchain/21495

---
 share/mk/bsd.hostprog.mk     | 4 ++--
 usr.bin/xlint/lint1/Makefile | 4 ++--
 usr.sbin/sunlabel/Makefile   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/share/mk/bsd.hostprog.mk b/share/mk/bsd.hostprog.mk
index 873e8a07a71a..af751366855c 100644
--- a/share/mk/bsd.hostprog.mk
+++ b/share/mk/bsd.hostprog.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.hostprog.mk,v 1.25 2002/09/17 23:18:29 thorpej Exp $
+#	$NetBSD: bsd.hostprog.mk,v 1.26 2003/05/14 00:24:06 dbj Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .include <bsd.init.mk>
@@ -73,7 +73,7 @@ LOBJS+=		${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
 .if defined(OBJS) && !empty(OBJS)
 .NOPATH: ${OBJS} ${HOSTPROG} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}}
 
-${HOSTPROG}: ${DPSRCS} ${OBJS} ${LIBC} ${DPADD}
+${HOSTPROG}: ${DPSRCS} ${OBJS} ${DPADD}
 	${HOST_LINK.c} ${HOST_LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD}
 
 .endif	# defined(OBJS) && !empty(OBJS)
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index 9d52d6e60882..f2a5a145636a 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.26 2002/02/01 05:44:40 lukem Exp $
+#	$NetBSD: Makefile,v 1.27 2003/05/14 00:24:07 dbj Exp $
 
 .include <bsd.own.mk>
 
@@ -39,9 +39,9 @@ ${MAN}:		makeman ${LINT1:C/^\.\///} Makefile
 	sh ${.ALLSRC:M*makeman} ${LINT1} -m >${.TARGET}
 
 LDADD+=		-lm
+.ifndef HOSTPROG
 DPADD+=		${LIBM}
 
-.ifndef HOSTPROG
 LDADD+=		-ll
 DPADD+=		${LIBL}
 
diff --git a/usr.sbin/sunlabel/Makefile b/usr.sbin/sunlabel/Makefile
index 965417126ec9..8d83e205ddb1 100644
--- a/usr.sbin/sunlabel/Makefile
+++ b/usr.sbin/sunlabel/Makefile
@@ -1,12 +1,12 @@
-#	$NetBSD: Makefile,v 1.3 2003/03/13 04:50:53 thorpej Exp $
+#	$NetBSD: Makefile,v 1.4 2003/05/14 00:24:07 dbj Exp $
 
 PROG=	sunlabel
 MAN=	sunlabel.8
 
 LDADD+=	-ltermcap
+.ifndef HOSTPROG
 DPADD+=	${LIBTERMCAP}
 
-.ifndef HOSTPROG
 DPADD+=	${LIBUTIL}
 LDADD+=	-lutil
 .include <bsd.prog.mk>