svn commit: r291223 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Mon Nov 23 23:04:52 2015
New Revision: 291223
URL: https://svnweb.freebsd.org/changeset/base/291223

Log:
  There seems to be no reason to duplicate CANONICALOBJDIR logic from bsd.obj.mk,
  which is included for crunchgen builds.
  
  No change in build output occurred with this change.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.crunchgen.mk

Modified: head/share/mk/bsd.crunchgen.mk
==============================================================================
--- head/share/mk/bsd.crunchgen.mk	Mon Nov 23 22:06:55 2015	(r291222)
+++ head/share/mk/bsd.crunchgen.mk	Mon Nov 23 23:04:52 2015	(r291223)
@@ -38,13 +38,6 @@ OUTMK=	${PROG}.mk
 OUTC=	${PROG}.c
 OUTPUTS=${OUTMK} ${OUTC} ${PROG}.cache
 CRUNCHOBJS= ${.OBJDIR}
-.if defined(MAKEOBJDIRPREFIX)
-CANONICALOBJDIR:= ${MAKEOBJDIRPREFIX}${.CURDIR}
-.elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""
-CANONICALOBJDIR:= ${MAKEOBJDIR}
-.else
-CANONICALOBJDIR:= /usr/obj${.CURDIR}
-.endif
 CRUNCH_GENERATE_LINKS?= yes
 
 CLEANFILES+= ${CONF} *.o *.lo *.c *.mk *.cache *.a *.h