The branch main has been updated by sjg:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=dd4d206cad0cc8ba02ba10a039d708209a83a487

commit dd4d206cad0cc8ba02ba10a039d708209a83a487
Author:     Simon J. Gerraty <[email protected]>
AuthorDate: 2024-05-10 19:05:05 +0000
Commit:     Simon J. Gerraty <[email protected]>
CommitDate: 2024-05-10 19:05:05 +0000

    kmod.mk use ${XARGS}
    
    Also ${XARGS_J} this allows use of non-BSD xargs when building
    kernel modules.
    
    Reviewed by:    imp
    Differential Revision:  https://reviews.freebsd.org/D45146
---
 sys/conf/kmod.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 5cc0ff70c3e2..ed186619434d 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -71,6 +71,8 @@ KMODLOAD?=    /sbin/kldload
 KMODUNLOAD?=   /sbin/kldunload
 KMODISLOADED?= /sbin/kldstat -q -n
 OBJCOPY?=      objcopy
+XARGS?=                xargs
+XARGS_J?=      -J
 
 .include "kmod.opts.mk"
 .include <bsd.sysdir.mk>
@@ -275,12 +277,12 @@ ${FULLPROG}: ${OBJS} ${BLOB_OBJS}
        grep -v '^#' < ${EXPORT_SYMS} > export_syms
 .endif
        ${AWK} -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
-           export_syms | xargs -J% ${OBJCOPY} % ${.TARGET}
+           export_syms | ${XARGS} ${XARGS_J} % ${OBJCOPY} % ${.TARGET}
 .endif
 .endif # defined(EXPORT_SYMS)
 .if defined(PREFIX_SYMS)
        ${AWK} -v prefix=${PREFIX_SYMS} -f ${SYSDIR}/conf/kmod_syms_prefix.awk \
-           ${.TARGET} /dev/null | xargs -J% ${OBJCOPY} % ${.TARGET}
+           ${.TARGET} /dev/null | ${XARGS} ${XARGS_J} % ${OBJCOPY} % ${.TARGET}
 .endif
 .if !defined(DEBUG_FLAGS) && ${__KLD_SHARED} == no
        ${OBJCOPY} --strip-debug ${.TARGET}

Reply via email to