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/
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
