svn commit: r307543 - head/share/mk

[Marcel Moolenaar]

Author: marcel
Date: Tue Oct 18 01:42:42 2016
New Revision: 307543
URL: https://svnweb.freebsd.org/changeset/base/307543

Log:
  Add LORDER, TSORT and TSORTFLAGS variables and replace the
  hardcoded utility names and tsort flags.

Modified:
  head/share/mk/bsd.lib.mk
  head/share/mk/sys.mk

Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk    Tue Oct 18 00:55:15 2016        (r307542)
+++ head/share/mk/bsd.lib.mk    Tue Oct 18 01:42:42 2016        (r307543)
@@ -178,7 +178,8 @@ _LIBS=              lib${LIB_PRIVATE}${LIB}.a
 lib${LIB_PRIVATE}${LIB}.a: ${OBJS} ${STATICOBJS}
        @${ECHO} building static ${LIB} library
        @rm -f ${.TARGET}
-       ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder 
${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+       ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' \
+           ${LORDER} ${OBJS} ${STATICOBJS} | ${TSORT} ${TSORTFLAGS}` ${ARADD}
        ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
 .endif
 
@@ -193,7 +194,8 @@ CLEANFILES+=        ${POBJS}
 lib${LIB_PRIVATE}${LIB}_p.a: ${POBJS}
        @${ECHO} building profiled ${LIB} library
        @rm -f ${.TARGET}
-       ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder 
${POBJS} | tsort -q` ${ARADD}
+       ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' \
+           ${LORDER} ${POBJS} | ${TSORT} ${TSORTFLAGS}` ${ARADD}
        ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
 .endif
 
@@ -241,7 +243,8 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
 .endif
        ${_LD:N${CCACHE_BIN}} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
            -o ${.TARGET} -Wl,-soname,${SONAME} \
-           `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${SOBJS} | tsort -q` 
${LDADD}
+           `NM='${NM}' NMFLAGS='${NMFLAGS}' ${LORDER} ${SOBJS} | \
+           ${TSORT} ${TSORTFLAGS}` ${LDADD}
 .if ${MK_CTF} != "no"
        ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
 .endif

Modified: head/share/mk/sys.mk
==============================================================================
--- head/share/mk/sys.mk        Tue Oct 18 00:55:15 2016        (r307542)
+++ head/share/mk/sys.mk        Tue Oct 18 01:42:42 2016        (r307543)
@@ -229,6 +229,8 @@ LINTLIBFLAGS        ?=      -cghapbxu -C ${LIB}
 MAKE           ?=      make
 
 .if !defined(%POSIX)
+LORDER         ?=      lorder
+
 NM             ?=      nm
 NMFLAGS                ?=
 
@@ -242,6 +244,9 @@ PFLAGS              ?=
 
 RC             ?=      f77
 RFLAGS         ?=
+
+TSORT          ?=      tsort
+TSORTFLAGS     ?=      -q
 .endif
 
 SHELL          ?=      sh
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"