diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2017-06-23 20:07:56 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2017-06-23 20:07:56 +0000 |
| commit | d6fe69d490b8b5c0545740ec1ed0743c3af1d9fe (patch) | |
| tree | a494bb0fcb3fbab5da1751c187dee2a534623434 /share/mk/local.sys.mk | |
| parent | 15bd171b59c4c5f09cc9236637bd9e698f44342d (diff) | |
| download | FreeBSD-src-d6fe69d490b8b5c0545740ec1ed0743c3af1d9fe.zip FreeBSD-src-d6fe69d490b8b5c0545740ec1ed0743c3af1d9fe.tar.gz | |
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)
Diffstat (limited to 'share/mk/local.sys.mk')
| -rw-r--r-- | share/mk/local.sys.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index 2693a69..e3bfd57 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -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 \ |
