Author: bdrewery
Date: Fri Apr 3 17:25:41 2015
New Revision: 281038
URL: https://svnweb.freebsd.org/changeset/base/281038
Log:
MFC r280177:
Remove unneeded handling of undefined NM.
Modified:
stable/9/share/mk/bsd.lib.mk
Directory Properties:
stable/9/share/mk/ (props changed)
Modified: stable/9/share/mk/bsd.lib.mk
==============================================================================
--- stable/9/share/mk/bsd.lib.mk Fri Apr 3 17:21:30 2015
(r281037)
+++ stable/9/share/mk/bsd.lib.mk Fri Apr 3 17:25:41 2015
(r281038)
@@ -167,11 +167,7 @@ _LIBS= lib${LIB}.a
lib${LIB}.a: ${OBJS} ${STATICOBJS}
@${ECHO} building static ${LIB} library
@rm -f ${.TARGET}
-.if !defined(NM)
- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
-.else
@${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort
-q` ${ARADD}
-.endif
${RANLIB} ${.TARGET}
.endif
@@ -184,11 +180,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=
lib${LIB}_p.a: ${POBJS}
@${ECHO} building profiled ${LIB} library
@rm -f ${.TARGET}
-.if !defined(NM)
- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
-.else
@${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
-.endif
${RANLIB} ${.TARGET}
.endif
@@ -215,15 +207,9 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
.if defined(SHLIB_LINK)
@${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
.endif
-.if !defined(NM)
- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
- -o ${.TARGET} -Wl,-soname,${SONAME} \
- `lorder ${SOBJS} | tsort -q` ${LDADD}
-.else
@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
-o ${.TARGET} -Wl,-soname,${SONAME} \
`NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
-.endif
.if ${MK_CTF} != "no"
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
.endif
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
