From owner-svn-src-all@freebsd.org  Fri Jun 23 20:07:58 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 21F4AD88E46;
 Fri, 23 Jun 2017 20:07:58 +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 D92197262A;
 Fri, 23 Jun 2017 20:07:57 +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 v5NK7uEO002040;
 Fri, 23 Jun 2017 20:07:56 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5NK7u7E002039;
 Fri, 23 Jun 2017 20:07:56 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201706232007.v5NK7u7E002039@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, 23 Jun 2017 20:07:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r320295 - stable/11/share/mk
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jun 2017 20:07:58 -0000

Author: bdrewery
Date: Fri Jun 23 20:07:56 2017
New Revision: 320295
URL: https://svnweb.freebsd.org/changeset/base/320295

Log:
  MFC r319862,r319996,r320030:
  
    r319862:
      META_MODE: Show .ERROR_CMD in error.
    r319996:
      WITH_META_MODE: Don't try showing command if .ERROR_META_FILE is empty.
    r320030:
      WITH_META_MODE: End each ERROR_CMD CMD line with ';'.
  
  Approved by:	re (gjb, marius)

Modified:
  stable/11/share/mk/local.sys.mk
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/mk/local.sys.mk
==============================================================================
--- stable/11/share/mk/local.sys.mk	Fri Jun 23 19:44:20 2017	(r320294)
+++ stable/11/share/mk/local.sys.mk	Fri Jun 23 20:07:56 2017	(r320295)
@@ -13,7 +13,10 @@ MAKE_PRINT_VAR_ON_ERROR += \
 	.MAKE.MODE
 .endif
 
+_ERROR_CMD_EXEC=	${sed -n '/^CMD/s,^CMD \(.*\),\1;,p' ${.ERROR_META_FILE}:L:sh}
+_ERROR_CMD=		${!empty(.ERROR_META_FILE):?${_ERROR_CMD_EXEC}:.PHONY}
 MAKE_PRINT_VAR_ON_ERROR+= \
+	_ERROR_CMD \
 	.CURDIR \
 	.MAKE \
 	.OBJDIR \