build.mk: added Conflicts: to error filter

Just stumbled into that and (falsely) blamed vseleznv@! :(
This commit is contained in:
Michael Shigorin 2019-02-14 20:55:58 +03:00
parent 2f389cfce1
commit 801455fece

View File

@ -4,7 +4,7 @@ ANSI_FAIL ?= 1;31
MAX_LINES = 200
MAX_ERRORS = 5
GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (FAILURE|FATAL|ERROR|conflicts|Depends:) .*)|(.* (Stop|failed|not found)\.)|(not allowed))$$
GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (FAILURE|FATAL|ERROR|conflicts|Conflicts:|Depends:) .*)|(.* (Stop|failed|not found)\.)|(not allowed))$$
ifndef MKIMAGE_PROFILES
$(error this makefile is designed to be included in toplevel one)