summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2004-02-09 14:05:17 +0000
committerru <ru@FreeBSD.org>2004-02-09 14:05:17 +0000
commit951150d25a152b9b7302661fb693e51d0ffe17f1 (patch)
treefbed55a44bf39e9cbba00deb3e51a34da23ad563 /share
parent219a6c0a9cdd941b6d0c92e4efd2fb51cd07363f (diff)
downloadFreeBSD-src-951150d25a152b9b7302661fb693e51d0ffe17f1.zip
FreeBSD-src-951150d25a152b9b7302661fb693e51d0ffe17f1.tar.gz
Two changes to aid in cleaning up sys/boot/ makefiles:
- Don't put libc.a as a dependency if program is linked with -nostdlib. - Added INTERNALPROG (by analogy to INTERNALLIB) for programs which are built only for its side effect and shold not be installed.
Diffstat (limited to 'share')
-rw-r--r--share/mk/bsd.prog.mk12
1 files changed, 9 insertions, 3 deletions
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 35b81f5..27e3d26 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -96,13 +96,21 @@ CLEANFILES+= ${PROG}
CLEANFILES+= ${OBJS}
.endif
+.include <bsd.libnames.mk>
+
.if defined(PROG)
_EXTRADEPEND:
+.if defined(LDFLAGS) && !empty(LDFLAGS:M-nostdlib)
+.if defined(DPADD) && !empty(DPADD)
+ echo ${PROG}: ${DPADD} >> ${DEPENDFILE}
+.endif
+.else
echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
.if defined(PROG_CXX)
echo ${PROG}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
.endif
.endif
+.endif
.if !target(install)
@@ -111,7 +119,7 @@ _INSTALLFLAGS:= ${INSTALLFLAGS}
_INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
.endfor
-.if !target(realinstall)
+.if !target(realinstall) && !defined(INTERNALPROG)
realinstall: _proginstall
.ORDER: beforeinstall _proginstall
_proginstall:
@@ -179,8 +187,6 @@ lint: ${SRCS:M*.c}
.include <bsd.man.mk>
.endif
-.include <bsd.libnames.mk>
-
.include <bsd.dep.mk>
.if defined(PROG) && !exists(${.OBJDIR}/${DEPENDFILE})
OpenPOWER on IntegriCloud