From owner-svn-src-head@freebsd.org  Fri Jun 16 04:28:12 2017
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 330D2BF5F6B;
 Fri, 16 Jun 2017 04:28:12 +0000 (UTC)
 (envelope-from bdrewery@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 mx1.freebsd.org (Postfix) with ESMTPS id 83B196F6FC;
 Fri, 16 Jun 2017 04:28:11 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5G4SA88052705;
 Fri, 16 Jun 2017 04:28:10 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5G4SANi052704;
 Fri, 16 Jun 2017 04:28:10 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201706160428.v5G4SANi052704@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 16 Jun 2017 04:28:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r319996 - head/share/mk
X-SVN-Group: head
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.23
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, 16 Jun 2017 04:28:12 -0000

Author: bdrewery
Date: Fri Jun 16 04:28:10 2017
New Revision: 319996
URL: https://svnweb.freebsd.org/changeset/base/319996

Log:
  WITH_META_MODE: Don't try showing command if .ERROR_META_FILE is empty.
  
  This was sed'ing on stdin for failing .PHONY targets.
  
  Reported by:	Mark Millard
  X-MFC-With:	r319862
  MFC after:	1 week
  Sponsored by:	Dell EMC Isilon

Modified:
  head/share/mk/local.sys.mk

Modified: head/share/mk/local.sys.mk
==============================================================================
--- head/share/mk/local.sys.mk	Fri Jun 16 01:26:01 2017	(r319995)
+++ head/share/mk/local.sys.mk	Fri Jun 16 04:28:10 2017	(r319996)
@@ -13,7 +13,8 @@ MAKE_PRINT_VAR_ON_ERROR += \
 	.MAKE.MODE
 .endif
 
-_ERROR_CMD=${sed -n '/^CMD/s,^CMD ,,p' ${.ERROR_META_FILE}:L:sh}
+_ERROR_CMD_EXEC=	${sed -n '/^CMD/s,^CMD ,,p' ${.ERROR_META_FILE}:L:sh}
+_ERROR_CMD=		${!empty(.ERROR_META_FILE):?${_ERROR_CMD_EXEC}:.PHONY}
 MAKE_PRINT_VAR_ON_ERROR+= \
 	_ERROR_CMD \
 	.CURDIR \