diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-06-16 04:28:10 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-06-16 04:28:10 +0000 |
| commit | 51deaaab9087f1070fd9936032c2ac3b30a25884 (patch) | |
| tree | ad042ab24d5db73dda0a7189e9a093b809a56d2f /share/mk/local.sys.mk | |
| parent | daaa9bf1df866c03a3c5a58fe202cf98923437ac (diff) | |
| download | src-51deaaab9087f1070fd9936032c2ac3b30a25884.tar.gz src-51deaaab9087f1070fd9936032c2ac3b30a25884.zip | |
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
Notes
Notes:
svn path=/head/; revision=319996
Diffstat (limited to 'share/mk/local.sys.mk')
| -rw-r--r-- | share/mk/local.sys.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index 15b8eb402ea0..47c8034fb4af 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -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 \ |