Date: Wed, 16 Sep 2015 18:02:05 +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: r287867 - head/share/mk Message-ID: <201509161802.t8GI25D6018679@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Sep 16 18:02:04 2015 New Revision: 287867 URL: https://svnweb.freebsd.org/changeset/base/287867 Log: Error and give better feedback for invalid MAKEOBJDIR settings. Submitted by: sjg Modified: head/share/mk/local.meta.sys.mk Modified: head/share/mk/local.meta.sys.mk ============================================================================== --- head/share/mk/local.meta.sys.mk Wed Sep 16 17:56:24 2015 (r287866) +++ head/share/mk/local.meta.sys.mk Wed Sep 16 18:02:04 2015 (r287867) @@ -16,14 +16,18 @@ OBJROOT:=${MAKEOBJDIRPREFIX}${SRCTOP:S,/ MAKEOBJDIRPREFIX= .export MAKEOBJDIRPREFIX .endif -.if empty(MAKEOBJDIR) || ${MAKEOBJDIR:M*/*} == "" +_default_makeobjdir=$${.CURDIR:S,$${SRCTOP},$${OBJTOP},} +.if empty(MAKEOBJDIR) # OBJTOP set below -MAKEOBJDIR=$${.CURDIR:S,$${SRCTOP},$${OBJTOP},} +MAKEOBJDIR=${_default_makeobjdir} # export but do not track .export-env MAKEOBJDIR # now for our own use MAKEOBJDIR= ${.CURDIR:S,${SRCTOP},${OBJTOP},} .endif +.if ${MAKEOBJDIR:M*/*} == "" +.error Cannot use MAKEOBJDIR=${MAKEOBJDIR}${.newline}Unset MAKEOBJDIR to get default: MAKEOBJDIR='${_default_makeobjdir}' +.endif .endif .if !empty(SB) SB_OBJROOT ?= ${SB}/obj/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509161802.t8GI25D6018679>