svn commit: r280177 - head/share/mk
Bryan Drewery
bdrewery at FreeBSD.org
Tue Mar 17 15:11:46 UTC 2015
Author: bdrewery
Date: Tue Mar 17 15:11:45 2015
New Revision: 280177
URL: https://svnweb.freebsd.org/changeset/base/280177
Log:
Remove unneeded handling of undefined NM.
Pointed out by: imp
Discussed at: https://reviews.freebsd.org/D2039
MFC after: 2 weeks
Modified:
head/share/mk/bsd.lib.mk
Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk Tue Mar 17 15:04:28 2015 (r280176)
+++ head/share/mk/bsd.lib.mk Tue Mar 17 15:11:45 2015 (r280177)
@@ -170,11 +170,7 @@ _LIBS= lib${LIB}.a
lib${LIB}.a: ${OBJS} ${STATICOBJS}
@${ECHO} building static ${LIB} library
@rm -f ${.TARGET}
-.if !defined(NM)
- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
-.else
@${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
-.endif
${RANLIB} ${RANLIBFLAGS} ${.TARGET}
.endif
@@ -188,11 +184,7 @@ NOPATH_FILES+= ${POBJS}
lib${LIB}_p.a: ${POBJS}
@${ECHO} building profiled ${LIB} library
@rm -f ${.TARGET}
-.if !defined(NM)
- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
-.else
@${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
-.endif
${RANLIB} ${RANLIBFLAGS} ${.TARGET}
.endif
@@ -225,15 +217,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
More information about the svn-src-all
mailing list