Mon Jul 20 12:20:26 2015 UTC ()
Simplify the build of library archives by no longer doing a topological
sort.


(joerg)
diff -r1.358 -r1.359 src/share/mk/bsd.lib.mk
cvs diff -r1.358 -r1.359 src/share/mk/bsd.lib.mk (expand / switch to unified diff)

--- src/share/mk/bsd.lib.mk 2015/06/04 06:01:24 1.358
+++ src/share/mk/bsd.lib.mk 2015/07/20 12:20:26 1.359
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.lib.mk,v 1.358 2015/06/04 06:01:24 mrg Exp $ 1# $NetBSD: bsd.lib.mk,v 1.359 2015/07/20 12:20:26 joerg Exp $
2# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 2# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
3 3
4.include <bsd.init.mk> 4.include <bsd.init.mk>
5.include <bsd.shlib.mk> 5.include <bsd.shlib.mk>
6.include <bsd.gcc.mk> 6.include <bsd.gcc.mk>
7# Pull in <bsd.sys.mk> here so we can override its .c.o rule 7# Pull in <bsd.sys.mk> here so we can override its .c.o rule
8.include <bsd.sys.mk> 8.include <bsd.sys.mk>
9 9
10LIBISMODULE?= no 10LIBISMODULE?= no
11LIBISPRIVATE?= no 11LIBISPRIVATE?= no
12LIBISCXX?= no 12LIBISCXX?= no
13 13
14.if ${LIBISMODULE} != "no" 14.if ${LIBISMODULE} != "no"
@@ -532,27 +532,27 @@ _ARRANFL=sD @@ -532,27 +532,27 @@ _ARRANFL=sD
532_INSTRANLIB= 532_INSTRANLIB=
533.else 533.else
534_ARFL=crs 534_ARFL=crs
535_ARRANFL=s 535_ARRANFL=s
536_INSTRANLIB=${empty(PRESERVE):?-a "${RANLIB} -t":} 536_INSTRANLIB=${empty(PRESERVE):?-a "${RANLIB} -t":}
537.endif 537.endif
538 538
539# If you change this, please consider reflecting the change in 539# If you change this, please consider reflecting the change in
540# the override in sys/rump/Makefile.rump. 540# the override in sys/rump/Makefile.rump.
541.if !target(__archivebuild) 541.if !target(__archivebuild)
542__archivebuild: .USE 542__archivebuild: .USE
543 ${_MKTARGET_BUILD} 543 ${_MKTARGET_BUILD}
544 rm -f ${.TARGET} 544 rm -f ${.TARGET}
545 ${AR} ${_ARFL} ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}` 545 ${AR} ${_ARFL} ${.TARGET} ${.ALLSRC:M*o:O}
546.endif 546.endif
547 547
548.if !target(__archiveinstall) 548.if !target(__archiveinstall)
549__archiveinstall: .USE 549__archiveinstall: .USE
550 ${_MKTARGET_INSTALL} 550 ${_MKTARGET_INSTALL}
551 ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ 551 ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
552 ${_INSTRANLIB} ${.ALLSRC} ${.TARGET} 552 ${_INSTRANLIB} ${.ALLSRC} ${.TARGET}
553.endif 553.endif
554 554
555__archivesymlinkpic: .USE 555__archivesymlinkpic: .USE
556 ${_MKTARGET_INSTALL} 556 ${_MKTARGET_INSTALL}
557 ${INSTALL_SYMLINK} ${.ALLSRC} ${.TARGET} 557 ${INSTALL_SYMLINK} ${.ALLSRC} ${.TARGET}
558 558