d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quote ${MAKE} when passing in env in case it contains spaces.

Browse Source 
Downstream we are wrapping MAKE with a limits(1) call which
interferes with these non-quoted cases.

Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-08-16 17:54:24 +00:00
parent 63cd05d97a
commit 96dd05dd7d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -221,7 +221,7 @@ SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \
SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk
.endif .endif
_MAKE= PATH=${PATH} MAKE_CMD=${MAKE} ${SUB_MAKE} -f Makefile.inc1 \ _MAKE= PATH=${PATH} MAKE_CMD="${MAKE}" ${SUB_MAKE} -f Makefile.inc1 \
TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
# Only allow meta mode for the whitelisted targets. See META_TGT_WHITELIST # Only allow meta mode for the whitelisted targets. See META_TGT_WHITELIST

2
share/mk/bsd.crunchgen.mk
View File

@ -114,7 +114,7 @@ CRUNCHENV+= MK_TESTS=no \
${OUTPUTS:[1]}: .META ${OUTPUTS:[1]}: .META
${OUTPUTS:[2..-1]}: .NOMETA ${OUTPUTS:[2..-1]}: .NOMETA
${OUTPUTS}: ${CONF} ${OUTPUTS}: ${CONF}
MAKE=${MAKE} ${CRUNCHENV:NMK_AUTO_OBJ=*} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \ MAKE="${MAKE}" ${CRUNCHENV:NMK_AUTO_OBJ=*} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \
MK_AUTO_OBJ=${MK_AUTO_OBJ} \ MK_AUTO_OBJ=${MK_AUTO_OBJ} \
${CRUNCHGEN} -fq -m ${OUTMK} -c ${OUTC} ${CONF} ${CRUNCHGEN} -fq -m ${OUTMK} -c ${OUTC} ${CONF}
# Avoid redundantly calling 'make objs' which we've done by our # Avoid redundantly calling 'make objs' which we've done by our

2
sys/conf/kern.post.mk
View File

@ -372,7 +372,7 @@ config.ln env.ln hints.ln vers.ln vnode_if.ln:
REPRO_FLAG="-r" REPRO_FLAG="-r"
.endif .endif
vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP} vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
MAKE=${MAKE} sh $S/conf/newvers.sh ${REPRO_FLAG} ${KERN_IDENT} MAKE="${MAKE}" sh $S/conf/newvers.sh ${REPRO_FLAG} ${KERN_IDENT}
vnode_if.c: $S/tools/vnode_if.awk $S/kern/vnode_if.src vnode_if.c: $S/tools/vnode_if.awk $S/kern/vnode_if.src
${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -c ${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -c