diff options
| author | bde <bde@FreeBSD.org> | 1994-10-25 17:55:25 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1994-10-25 17:55:25 +0000 |
| commit | 7661c0a19673db6f57016138b7e09c6099930726 (patch) | |
| tree | 22d497226c5363c55371669ef4e6894bfbadc042 /share | |
| parent | c4b64391bfe03409e1e53efa97313d441ffa6cae (diff) | |
| download | FreeBSD-src-7661c0a19673db6f57016138b7e09c6099930726.zip FreeBSD-src-7661c0a19673db6f57016138b7e09c6099930726.tar.gz | |
Some profiled/shared objects were being built despite NOPROFILE/NOPIC
being set.
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.lib.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 7bc5200..f65dcd6 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $Id: bsd.lib.mk,v 1.8 1994/09/18 22:06:04 wollman Exp $ +# $Id: bsd.lib.mk,v 1.9 1994/09/18 22:22:32 wollman Exp $ # .if exists(${.CURDIR}/../Makefile.inc) @@ -150,17 +150,20 @@ lib${LIB}.a:: ${OBJS} @${AR} cTq lib${LIB}.a `lorder ${OBJS} | tsort` ${ARADD} ${RANLIB} lib${LIB}.a +.if !defined(NOPROFILE) POBJS+= ${OBJS:.o=.po} lib${LIB}_p.a:: ${POBJS} @${ECHO} building profiled ${LIB} library @rm -f lib${LIB}_p.a @${AR} cTq lib${LIB}_p.a `lorder ${POBJS} | tsort` ${ARADD} ${RANLIB} lib${LIB}_p.a +.endif .if defined(DESTDIR) LDDESTDIR?= -L${DESTDIR}/usr/lib .endif +.if !defined(NOPIC) .if defined(CPLUSPLUSLIB) && !make(clean) && !make(cleandir) SOBJS+= ${DESTDIR}/usr/lib/c++rt0.o .endif @@ -178,6 +181,7 @@ lib${LIB}_pic.a:: ${SOBJS} @rm -f lib${LIB}_pic.a @${AR} cTq lib${LIB}_pic.a ${SOBJS} ${ARADD} ${RANLIB} lib${LIB}_pic.a +.endif llib-l${LIB}.ln: ${SRCS} ${LINT} -C${LIB} ${CFLAGS} ${.ALLSRC:M*.c} |
