Date: Sat, 4 Nov 2017 21:59:54 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325408 - head/share/mk Message-ID: <201711042159.vA4LxsSt086463@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sat Nov 4 21:59:54 2017 New Revision: 325408 URL: https://svnweb.freebsd.org/changeset/base/325408 Log: Follow-up r325405: Only enable assertion for in-tree src builds. Pointyhat to: bdrewery Reported by: O. Hartmann <ohartmann@walstatt.org> Sponsored by: Dell EMC Isilon Modified: head/share/mk/bsd.obj.mk Modified: head/share/mk/bsd.obj.mk ============================================================================== --- head/share/mk/bsd.obj.mk Sat Nov 4 21:30:27 2017 (r325407) +++ head/share/mk/bsd.obj.mk Sat Nov 4 21:59:54 2017 (r325408) @@ -84,7 +84,8 @@ OBJTOP?= ${MAKEOBJDIR} CANONICALOBJDIR:=/usr/obj${.CURDIR} .endif -.if ${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} == /${RELDIR} +.if defined(SRCTOP) && \ + (${CANONICALOBJDIR} == /${RELDIR} || ${.OBJDIR} == /${RELDIR}) .error .OBJDIR incorrectly set to /${RELDIR} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711042159.vA4LxsSt086463>