From owner-svn-src-head@freebsd.org  Fri Jul 27 22:46:43 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C30E01059537;
 Fri, 27 Jul 2018 22:46:43 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 671278D319;
 Fri, 27 Jul 2018 22:46:43 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 429BA1E13B;
 Fri, 27 Jul 2018 22:46:43 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6RMkh4I049842;
 Fri, 27 Jul 2018 22:46:43 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6RMkhX7049841;
 Fri, 27 Jul 2018 22:46:43 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201807272246.w6RMkhX7049841@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Fri, 27 Jul 2018 22:46:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r336794 - head/share/mk
X-SVN-Group: head
X-SVN-Commit-Author: brd
X-SVN-Commit-Paths: head/share/mk
X-SVN-Commit-Revision: 336794
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Jul 2018 22:46:43 -0000

Author: brd
Date: Fri Jul 27 22:46:42 2018
New Revision: 336794
URL: https://svnweb.freebsd.org/changeset/base/336794

Log:
  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

Modified:
  head/share/mk/bsd.confs.mk

Modified: head/share/mk/bsd.confs.mk
==============================================================================
--- head/share/mk/bsd.confs.mk	Fri Jul 27 22:35:07 2018	(r336793)
+++ head/share/mk/bsd.confs.mk	Fri Jul 27 22:46:42 2018	(r336794)
@@ -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}}