svn commit: r320295 - stable/11/share/mk

[Bryan Drewery]

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 \