From d7296a8faeef2f4a69307412f620504604c76392 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Thu, 14 Apr 2016 21:04:49 +0000 Subject: [PATCH] Implement the dependency condition more safely. Nested : are not handled well without "". Sponsored by: EMC / Isilon Storage Division --- share/mk/bsd.dep.mk | 2 +- sys/conf/kern.post.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index 50ed33c2838..d80cb9de117 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -174,7 +174,7 @@ DEPEND_CFLAGS+= -MT${.TARGET} .if defined(.PARSEDIR) # Only add in DEPEND_CFLAGS for CFLAGS on files we expect from DEPENDOBJS # as those are the only ones we will include. -DEPEND_CFLAGS_CONDITION= !empty(DEPENDOBJS:M${.TARGET:${DEPEND_FILTER}}) +DEPEND_CFLAGS_CONDITION= "${DEPENDOBJS:M${.TARGET:${DEPEND_FILTER}}}" != "" CFLAGS+= ${${DEPEND_CFLAGS_CONDITION}:?${DEPEND_CFLAGS}:} .else CFLAGS+= ${DEPEND_CFLAGS} diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index d28e87b6875..3286c6656fc 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -215,7 +215,7 @@ DEPEND_CFLAGS+= -MT${.TARGET} .if defined(.PARSEDIR) # Only add in DEPEND_CFLAGS for CFLAGS on files we expect from DEPENDOBJS # as those are the only ones we will include. -DEPEND_CFLAGS_CONDITION= !empty(DEPENDOBJS:M${.TARGET}) +DEPEND_CFLAGS_CONDITION= "${DEPENDOBJS:M${.TARGET}}" != "" CFLAGS+= ${${DEPEND_CFLAGS_CONDITION}:?${DEPEND_CFLAGS}:} .else CFLAGS+= ${DEPEND_CFLAGS}