diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-11-10 02:09:37 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-11-10 02:09:37 +0000 |
| commit | faa5a80eb4e12fd196181dcbc785631ccc155d9b (patch) | |
| tree | 402ae503158aec0059277d471f370a966bb85bbb /Makefile | |
| parent | fa65e3a53d378ff5a6d3746ac65c2247b401c04c (diff) | |
| download | src-faa5a80eb4e12fd196181dcbc785631ccc155d9b.tar.gz src-faa5a80eb4e12fd196181dcbc785631ccc155d9b.zip | |
Deal with src.conf for top-level MAKEOBJDIRPREFIX guard.
- Don't discard SRCCONF value since it may incorrectly have MAKEOBJDIRPREFIX
in it.
- Add note about src.conf not being a suitable place for MAKEOBJDIRPREFIX.
Sponsored by: Dell EMC Isilon
Notes
Notes:
svn path=/head/; revision=325627
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -191,10 +191,11 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} MK_AUTO_OBJ=no \ ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \ + SRCCONF=${SRCCONF} \ -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 command-line variable. + (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. |