mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-27 08:00:11 +00:00
Code Issues Releases Activity

Remove MK_AUTO_OBJ from env passed to PORTS_MODULES

Browse Source 
This fixes a failure to resolve object file paths seen when buildkernel
(which sets MK_AUTO_OBJ=yes) and installkernel (which sets MK_AUTO_OBJ=no)
are run as separate steps.  r329232 partially fixed this scenario by removing
MAKEOBJDIR, but it seems the AUTO_OBJ setting also needs to be on the same
page for the build and install steps.

Reviewed by:	bdrewery
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D14143
This commit is contained in:
Jason A. Harmening 2018-03-31 05:17:12 +00:00
parent 8708f1bdaf
commit 28da5c6d7a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=331836
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/conf/kern.post.mk
View File

@ -70,8 +70,9 @@ PORTSMODULESENV=\
-u CXX \
-u CPP \
-u MAKESYSPATH \
-u MK_AUTO_OBJ \
-u MAKEOBJDIR \
MAKEFLAGS="${MAKEFLAGS:M*:tW:S/^-m /-m_/g:S/ -m / -m_/g:tw:N-m_*}" \
MAKEFLAGS="${MAKEFLAGS:M*:tW:S/^-m /-m_/g:S/ -m / -m_/g:tw:N-m_*:NMK_AUTO_OBJ=*}" \
SYSDIR=${SYSDIR} \
PATH=${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin \
SRC_BASE=${SRC_BASE} \