From 47affdf8b0e1adde628d3edcba5306cda60009dd Mon Sep 17 00:00:00 2001 From: brd Date: Fri, 27 Jul 2018 22:46:42 +0000 Subject: [PATCH] Avoid a install(1) crash by not using -C when the source is /dev/null Approved by: allanjude (mentor) Differential Revision: https://reviews.freebsd.org/D16476 --- share/mk/bsd.confs.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk index a9a7aa8a2516..3d8d50d9f966 100644 --- a/share/mk/bsd.confs.mk +++ b/share/mk/bsd.confs.mk @@ -107,6 +107,12 @@ ${group}NAME_${cnf}?= ${${group}NAME} ${group}NAME_${cnf}?= ${cnf:T} . endif # defined(${group}NAME) +# Work around a bug with install(1) -C and /dev/null +. if ${cnf} == "/dev/null" +INSTALL_COPY= +. else +INSTALL_COPY= -C +. endif STAGE_AS_SETS+= ${cnf:T} STAGE_AS_${cnf:T}= ${${group}NAME_${cnf:T}} @@ -116,7 +122,7 @@ stage_as.${cnf:T}: ${cnf} realinstallconfig: installdirs-${_${group}DIR_${cnf}} _${group}INS_${cnf:T} _${group}INS_${cnf:T}: ${cnf} - ${INSTALL} ${${group}TAG_ARGS} -C -o ${${group}OWN_${cnf}} \ + ${INSTALL} ${${group}TAG_ARGS} ${INSTALL_COPY} -o ${${group}OWN_${cnf}} \ -g ${${group}GRP_${cnf}} -m ${${group}MODE_${cnf}} \ ${.ALLSRC} ${${group}PREFIX_${cnf}}/${${group}NAME_${cnf}} . endfor # for cnf in ${${group}}