svn commit: r281040 - stable/8/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Fri Apr  3 17:49:15 2015
New Revision: 281040
URL: https://svnweb.freebsd.org/changeset/base/281040

Log:
  MFC r280177:
  
    Remove unneeded handling of undefined NM.

Modified:
  stable/8/share/mk/bsd.lib.mk
Directory Properties:
  stable/8/share/mk/   (props changed)

Modified: stable/8/share/mk/bsd.lib.mk
==============================================================================
--- stable/8/share/mk/bsd.lib.mk	Fri Apr  3 17:35:30 2015	(r281039)
+++ stable/8/share/mk/bsd.lib.mk	Fri Apr  3 17:49:15 2015	(r281040)
@@ -138,11 +138,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
 
@@ -155,11 +151,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
 
@@ -181,15 +173,9 @@ ${SHLIB_NAME}: ${SOBJS}
 .if defined(SHLIB_LINK)
 	@ln -fs ${.TARGET} ${SHLIB_LINK}
 .endif
-.if !defined(NM)
-	@${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
-	    -o ${.TARGET} -Wl,-soname,${SONAME} \
-	    `lorder ${SOBJS} | tsort -q` ${LDADD}
-.else
 	@${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
 	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
-.endif
 .if ${MK_CTF} != "no"
 	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
 .endif