Date: Sun, 5 Nov 2017 16:28:05 +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: r325437 - head/share/mk Message-ID: <201711051628.vA5GS5Eo053591@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sun Nov 5 16:28:05 2017 New Revision: 325437 URL: https://svnweb.freebsd.org/changeset/base/325437 Log: Follow-up r325405: Fix assertion still for kernel module builds. Apparently they have SRCTOP set, but won't have RELDIR set since they are not in-tree. Pointyhat to: bdrewery Reported by: O. Hartmann <ohartmann@walstatt.org>, dhw Tested by: dhw 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 Sun Nov 5 14:41:48 2017 (r325436) +++ head/share/mk/bsd.obj.mk Sun Nov 5 16:28:05 2017 (r325437) @@ -85,7 +85,7 @@ OBJTOP?= ${MAKEOBJDIR} CANONICALOBJDIR:=/usr/obj${.CURDIR} .endif -.if defined(SRCTOP) && \ +.if defined(SRCTOP) && defined(RELDIR) && \ (${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?201711051628.vA5GS5Eo053591>