Date: Sun, 5 Nov 2017 00:12:02 +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: r325415 - head/share/mk Message-ID: <201711050012.vA50C2kQ042903@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sun Nov 5 00:12:02 2017 New Revision: 325415 URL: https://svnweb.freebsd.org/changeset/base/325415 Log: Validate MAKEOBJDIR after the MAKEOBJDIRPREFIX override. Sponsored by: Dell EMC Isilon Modified: head/share/mk/src.sys.obj.mk Modified: head/share/mk/src.sys.obj.mk ============================================================================== --- head/share/mk/src.sys.obj.mk Sun Nov 5 00:11:58 2017 (r325414) +++ head/share/mk/src.sys.obj.mk Sun Nov 5 00:12:02 2017 (r325415) @@ -77,13 +77,6 @@ OBJTOP:= ${OBJROOT}${TARGET:D${TARGET}.${TARGET_ARCH}: OBJTOP:= ${OBJROOT:H} .endif # ${MK_UNIFIED_OBJDIR} == "yes" -# Wait to validate MAKEOBJDIR until OBJTOP is set. -.if defined(MAKEOBJDIR) -.if ${MAKEOBJDIR:M/*} == "" -.error Cannot use MAKEOBJDIR=${MAKEOBJDIR}${.newline}Unset MAKEOBJDIR to get default: MAKEOBJDIR='${_default_makeobjdir}' -.endif -.endif - # Fixup OBJROOT/OBJTOP if using MAKEOBJDIRPREFIX but leave it alone # for DIRDEPS_BUILD which really wants to know the absolute top at # all times. This intenionally comes after adding TARGET.TARGET_ARCH @@ -92,6 +85,13 @@ OBJTOP:= ${OBJROOT:H} .if !empty(MAKEOBJDIRPREFIX) && ${MK_DIRDEPS_BUILD} == "no" OBJTOP:= ${MAKEOBJDIRPREFIX}${SRCTOP} OBJROOT:= ${OBJTOP}/ +.endif + +# Wait to validate MAKEOBJDIR until OBJTOP is set. +.if defined(MAKEOBJDIR) +.if ${MAKEOBJDIR:M/*} == "" +.error Cannot use MAKEOBJDIR=${MAKEOBJDIR}${.newline}Unset MAKEOBJDIR to get default: MAKEOBJDIR='${_default_makeobjdir}' +.endif .endif # Try to enable MK_AUTO_OBJ by default if we can write to the OBJROOT. Only
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711050012.vA50C2kQ042903>