svn commit: r325437 - head/share/mk

Bryan Drewery bdrewery at FreeBSD.org
Sun Nov 5 16:28:06 UTC 2017


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 at 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


More information about the svn-src-all mailing list