Date: Wed, 10 Jun 2015 18:09:06 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r284231 - projects/bmake/share/mk Message-ID: <201506101809.t5AI96V9072409@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Wed Jun 10 18:09:05 2015 New Revision: 284231 URL: https://svnweb.freebsd.org/changeset/base/284231 Log: If MK_AUTO_OBJ==yes, it is done before bsd.obj.mk included Modified: projects/bmake/share/mk/bsd.obj.mk Modified: projects/bmake/share/mk/bsd.obj.mk ============================================================================== --- projects/bmake/share/mk/bsd.obj.mk Wed Jun 10 17:27:48 2015 (r284230) +++ projects/bmake/share/mk/bsd.obj.mk Wed Jun 10 18:09:05 2015 (r284231) @@ -42,7 +42,12 @@ __<bsd.obj.mk>__: .include <bsd.own.mk> -.if defined(MAKEOBJDIRPREFIX) +.if ${MK_AUTO_OBJ} == "yes" +# it is done by now +objwarn: +obj: +CANONICALOBJDIR= ${.OBJDIR} +.elif defined(MAKEOBJDIRPREFIX) CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR} .elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != "" CANONICALOBJDIR:=${MAKEOBJDIR} @@ -50,15 +55,6 @@ CANONICALOBJDIR:=${MAKEOBJDIR} CANONICALOBJDIR:=/usr/obj${.CURDIR} .endif -.if defined(.PARSEDIR) && !defined(NO_OBJ) && !defined(NO_AUTO_OBJ) -.if ${MK_AUTO_OBJ} == "yes" -__objdir?= ${CANONICALOBJDIR} -# this is what auto.obj.mk wants to see -MKOBJDIRS=auto -.include "auto.obj.mk" -.endif -.endif - # # Warn of unorthodox object directory. #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506101809.t5AI96V9072409>