Author: bdrewery
Date: Sun Mar 4 23:39:12 2018
New Revision: 330429
URL: https://svnweb.freebsd.org/changeset/base/330429
Log:
MFC r330364:
Don't read SRC_ENV_CONF for MAKEOBJDIRPREFIX guard.
Modified:
stable/11/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/Makefile
==============================================================================
--- stable/11/Makefile Sun Mar 4 23:36:58 2018 (r330428)
+++ stable/11/Makefile Sun Mar 4 23:39:12 2018 (r330429)
@@ -171,11 +171,11 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin
MAKEOBJDIRPREFIX?= /usr/obj
_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} MK_AUTO_OBJ=no ${MAKE} \
${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
- SRCCONF=${SRCCONF} \
+ SRCCONF=${SRCCONF} SRC_ENV_CONF= \
-f /dev/null -V MAKEOBJDIRPREFIX dummy
.if !empty(_MAKEOBJDIRPREFIX)
-.error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
- (in make.conf(5) or src.conf(5)) or command-line variable.
+.error MAKEOBJDIRPREFIX can only be set in environment or src-env.conf(5),\
+ not as a global (in make.conf(5) or src.conf(5)) or command-line variable.
.endif
# We often need to use the tree's version of make to build it.
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
