From: bdrewery <bdrewery@FreeBSD.org>
Date: Sat, 17 Oct 2015 18:59:14 +0000 (+0000)
Subject: Remove unneeded MK_CTF=no when MK_CDDL=no.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ef80c05a84f47c786279fd01f430ab1ba90ef4aa;p=people%2Fjulieng%2Ffreebsd.git

Remove unneeded MK_CTF=no when MK_CDDL=no.

This has been handled since r228158 made MK_CTF dependent on MK_CDDL
in share/mk/bsd.opts.mk.

MFC after:	2 weeks
Sponsored by:	EMC / Isilon Storage Division
---

diff --git a/Makefile.inc1 b/Makefile.inc1
index 44b1171cdfa7..6056c37d5198 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -325,10 +325,6 @@ HMAKE=		PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE:Q}
 HMAKE+=		PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT
 .endif
 
-.if ${MK_CDDL} == "no"
-WMAKEENV+=	MK_CTF=no
-.endif
-
 .if defined(CROSS_TOOLCHAIN)
 LOCALBASE?=	/usr/local
 .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"