d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't read SRC_ENV_CONF for MAKEOBJDIRPREFIX guard.

Browse Source 
This is mostly to allow using MAKEOBJDIRPREFIX in src-env.conf on stable where
src.sys.obj.mk is not going to be MFC'd.  It is still valid on head but
effectively a NOP due to MAKEOBJDIRPREFIX being handled differently in
src.sys.obj.mk.

Reported by:	eadler
MFC after:	1 week
Sponsored by:	Dell EMC
This commit is contained in:
Bryan Drewery 2018-03-03 23:23:23 +00:00
parent 743ab0187f
commit 9d5beec1b9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -195,11 +195,11 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin
MAKEOBJDIRPREFIX?= /usr/obj MAKEOBJDIRPREFIX?= /usr/obj
_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} MK_AUTO_OBJ=no \ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} MK_AUTO_OBJ=no \
${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \ ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
SRCCONF=${SRCCONF} \ SRCCONF=${SRCCONF} SRC_ENV_CONF= \
-f /dev/null -V MAKEOBJDIRPREFIX dummy -f /dev/null -V MAKEOBJDIRPREFIX dummy
.if !empty(_MAKEOBJDIRPREFIX) .if !empty(_MAKEOBJDIRPREFIX)
.error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ .error MAKEOBJDIRPREFIX can only be set in environment or src-env.conf(5),\
(in make.conf(5) or src.conf(5)) or command-line variable. not as a global (in make.conf(5) or src.conf(5)) or command-line variable.
.endif .endif
# We often need to use the tree's version of make to build it. # We often need to use the tree's version of make to build it.