From e0e2794cd8498fa7fea1264dec50a8f63153a8b5 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Wed, 29 Jul 1998 14:19:48 +0000
Subject: Honor NOSHARED for tools.  All tools should be built static for `make
 world' to avoid problems with picking up (new) target or (stale) host shared
 libraries.

Don't honor -static in LDFLAGS for linking LKMs.  LDFLAGS is not
actually for ld, but we use it anyway, and must prevent -static being
misinterpreted as -s.

Don't hide any of the link steps.
---
 share/mk/bsd.kmod.mk | 14 +++++++++-----
 sys/conf/kmod.mk     | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk
index 6c73de908314..3d97b72a11df 100644
--- a/share/mk/bsd.kmod.mk
+++ b/share/mk/bsd.kmod.mk
@@ -1,5 +1,5 @@
 #	From: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-#	$Id: bsd.kmod.mk,v 1.48 1998/03/19 13:22:46 bde Exp $
+#	$Id: bsd.kmod.mk,v 1.49 1998/06/09 02:55:40 bde Exp $
 #
 # The include file <bsd.kmod.mk> handles installing Loadable Kernel Modules.
 #
@@ -106,6 +106,10 @@ CFLAGS+=	-I${.OBJDIR} -I${.OBJDIR}/@
 CFLAGS+=	-I${DESTDIR}/usr/include
 .endif
 
+.if defined(NOSHARED) && ( ${NOSHARED} != "no" && ${NOSHARED} != "NO" )
+LDFLAGS+= -static
+.endif
+
 EXPORT_SYMS?= _${KMOD}
 
 .if defined(VFS_LKM)
@@ -125,12 +129,12 @@ PROG=	${KMOD}.o
 .endif
 
 ${PROG}: ${OBJS} ${DPADD} 
-	${LD} -r ${LDFLAGS} -o tmp.o ${OBJS}
+	${LD} -r ${LDFLAGS:N-static} -o tmp.o ${OBJS}
 .if defined(EXPORT_SYMS)
-	@rm -f symb.tmp
-	@for i in ${EXPORT_SYMS} ; do echo $$i >> symb.tmp ; done
+	rm -f symb.tmp
+	for i in ${EXPORT_SYMS} ; do echo $$i >> symb.tmp ; done
 	symorder -c symb.tmp tmp.o
-	@rm -f symb.tmp
+	rm -f symb.tmp
 .endif
 	mv tmp.o ${.TARGET}
 
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 6c73de908314..3d97b72a11df 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -1,5 +1,5 @@
 #	From: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-#	$Id: bsd.kmod.mk,v 1.48 1998/03/19 13:22:46 bde Exp $
+#	$Id: bsd.kmod.mk,v 1.49 1998/06/09 02:55:40 bde Exp $
 #
 # The include file <bsd.kmod.mk> handles installing Loadable Kernel Modules.
 #
@@ -106,6 +106,10 @@ CFLAGS+=	-I${.OBJDIR} -I${.OBJDIR}/@
 CFLAGS+=	-I${DESTDIR}/usr/include
 .endif
 
+.if defined(NOSHARED) && ( ${NOSHARED} != "no" && ${NOSHARED} != "NO" )
+LDFLAGS+= -static
+.endif
+
 EXPORT_SYMS?= _${KMOD}
 
 .if defined(VFS_LKM)
@@ -125,12 +129,12 @@ PROG=	${KMOD}.o
 .endif
 
 ${PROG}: ${OBJS} ${DPADD} 
-	${LD} -r ${LDFLAGS} -o tmp.o ${OBJS}
+	${LD} -r ${LDFLAGS:N-static} -o tmp.o ${OBJS}
 .if defined(EXPORT_SYMS)
-	@rm -f symb.tmp
-	@for i in ${EXPORT_SYMS} ; do echo $$i >> symb.tmp ; done
+	rm -f symb.tmp
+	for i in ${EXPORT_SYMS} ; do echo $$i >> symb.tmp ; done
 	symorder -c symb.tmp tmp.o
-	@rm -f symb.tmp
+	rm -f symb.tmp
 .endif
 	mv tmp.o ${.TARGET}
 
-- 
cgit v1.3