Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Nov 2015 23:04:53 +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: r291223 - head/share/mk
Message-ID:  <201511232304.tANN4rOH054361@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511232304.tANN4rOH054361>