diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2018-03-04 23:39:12 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2018-03-04 23:39:12 +0000 |
| commit | 55dee002189f270d10238ceb4e1dfb0533bb7cbf (patch) | |
| tree | ad14dc4a015cf3a93ad199eb8a3464b4ed427703 /Makefile | |
| parent | f0dc2bef78c822afe534ebe86189397c276bfc40 (diff) | |
| download | src-55dee002189f270d10238ceb4e1dfb0533bb7cbf.tar.gz src-55dee002189f270d10238ceb4e1dfb0533bb7cbf.zip | |
MFC r330364:
Don't read SRC_ENV_CONF for MAKEOBJDIRPREFIX guard.
Notes
Notes:
svn path=/stable/11/; revision=330429
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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. |