mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-28 20:55:21 +00:00
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.
This commit is contained in:
parent
9f3a9c3a18
commit
e0e2794cd8
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=37948
|
@ -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}
|
||||
|
||||
|
|
|
@ -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}
|
||||
|
||||
|
|
Loading…
Reference in a new issue