From 593e46591333d8cd1b2d40abfcfdc88d9edb40ca Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Tue, 1 Dec 2015 03:00:10 +0000 Subject: [PATCH] FAST_DEPEND: Allow not using -MP by setting DEPEND_MP blank. -MP creates empty targets for all dependency files, which can be useful when a dependency is deleted from the file system. This would otherwise cause an error for "don't know how to build FOO" since the .depend file is included with the dependency registered. This is mostly a workaround for the misc/dahdi-kmod port using '::' for one of its dependencies, while -MP uses just ':'. This results in an 'Inconsistent operator for' error. X-MFC-With: r290433 MFC after: 1 week Sponsored by: EMC / Isilon Storage Division --- share/mk/bsd.dep.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index 2e5e48658f08..30f2b8f6c305 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -59,7 +59,8 @@ DEPENDFILE?= .depend DEPENDFILES= ${DEPENDFILE} .if ${MK_FAST_DEPEND} == "yes" && ${.MAKE.MODE:Unormal:Mmeta*} == "" DEPENDFILES+= ${DEPENDFILE}.* -DEPEND_CFLAGS+= -MD -MP -MF${DEPENDFILE}.${.TARGET} +DEPEND_MP?= -MP +DEPEND_CFLAGS+= -MD -MF${DEPENDFILE}.${.TARGET} DEPEND_CFLAGS+= -MT${.TARGET} CFLAGS+= ${DEPEND_CFLAGS} DEPENDOBJS+= ${OBJS} ${POBJS} ${SOBJS}