svn commit: r325408 - head/share/mk

Bryan Drewery bdrewery at FreeBSD.org
Sat Nov 4 21:59:55 UTC 2017


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


More information about the svn-src-head mailing list