Date: Tue, 18 Apr 2017 23:59:16 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r317106 - head/share/mk Message-ID: <201704182359.v3INxGQF070387@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Tue Apr 18 23:59:15 2017 New Revision: 317106 URL: https://svnweb.freebsd.org/changeset/base/317106 Log: If MAKEOBJDIRPREFIX is a prefix match for .CURDIR, then __objdir is .CURDIR Reviewed by: bdrewery Modified: head/share/mk/auto.obj.mk Modified: head/share/mk/auto.obj.mk ============================================================================== --- head/share/mk/auto.obj.mk Tue Apr 18 21:21:31 2017 (r317105) +++ head/share/mk/auto.obj.mk Tue Apr 18 23:59:15 2017 (r317106) @@ -42,6 +42,10 @@ MKOBJDIRS= auto # Use __objdir here so it is easier to tweak without impacting # the logic. .if !empty(MAKEOBJDIRPREFIX) +.if ${.CURDIR:M${MAKEOBJDIRPREFIX}/*} != "" +# we are already in obj tree! +__objdir?= ${.CURDIR} +.endif __objdir?= ${MAKEOBJDIRPREFIX}${.CURDIR} .endif __objdir?= ${MAKEOBJDIR:Uobj}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704182359.v3INxGQF070387>