diff options
| author | bde <bde@FreeBSD.org> | 1998-03-14 14:08:29 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-03-14 14:08:29 +0000 |
| commit | 1dbe6d5685b022622da4cc0412f4a5ee5ff94182 (patch) | |
| tree | 96e85b1449286b3e9bf5765321ceaf118cd2a5e3 /share/mk/bsd.obj.mk | |
| parent | b85d830b23db27cb0e28bbb7609fd580c604f6e8 (diff) | |
| download | FreeBSD-src-1dbe6d5685b022622da4cc0412f4a5ee5ff94182.zip FreeBSD-src-1dbe6d5685b022622da4cc0412f4a5ee5ff94182.tar.gz | |
Improved comparison of ${DPADD} with ${LDADD} for the checkdpadd target.
`BINFORMAT=foo make checkdpadd' in /usr/src now reports only 2 false
negatives (in libss and init). (BINFORMAT=foo is to turn off better
handling of the a.out case.)
Diffstat (limited to 'share/mk/bsd.obj.mk')
| -rw-r--r-- | share/mk/bsd.obj.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index da0d8b4..d1cc96b 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -1,4 +1,4 @@ -# $Id: bsd.obj.mk,v 1.21 1997/12/19 18:48:45 bde Exp $ +# $Id: bsd.obj.mk,v 1.22 1998/02/25 02:48:28 bde Exp $ # # The include file <bsd.obj.mk> handles creating the 'obj' directory # and cleaning up object files, etc. @@ -133,17 +133,21 @@ checkdpadd: _SUBDIR .if (defined(DPADD) || defined(LDADD)) checkdpadd: .if ${BINFORMAT} != aout - @if [ "${DPADD:S;^/usr/lib/lib;-l;S;.a$;;}" != "${LDADD}" ] ; then \ + @ldadd=`echo \`for lib in ${DPADD} ; do \ + echo $$lib | sed 's;^/usr/lib/lib\(.*\)\.a;-l\1;' ; \ + done \`` ; \ + ldadd1=`echo ${LDADD}` ; \ + if [ "$$ldadd" != "$$ldadd1" ] ; then \ echo ${.CURDIR} ; \ - echo "DPADD -> " ${DPADD:S;^/usr/lib/lib;-l;S;.a$;;} ; \ - echo "LDADD = " ${LDADD} ; \ + echo "DPADD -> $$ldadd" ; \ + echo "LDADD -> $$ldadd1" ; \ fi .else @dpadd=`echo \`ld -Bstatic -f ${LDDESTDIR} ${LDADD}\`` ; \ if [ "$$dpadd" != "${DPADD}" ] ; then \ echo ${.CURDIR} ; \ - echo "LDADD -> " $$dpadd ; \ - echo "DPADD = " ${DPADD} ; \ + echo "LDADD -> $$dpadd" ; \ + echo "DPADD = ${DPADD}" ; \ fi .endif .endif |
