Date: Sat, 31 Mar 2018 05:17:12 +0000 (UTC) From: "Jason A. Harmening" <jah@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331836 - head/sys/conf Message-ID: <201803310517.w2V5HCSg015284@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jah Date: Sat Mar 31 05:17:12 2018 New Revision: 331836 URL: https://svnweb.freebsd.org/changeset/base/331836 Log: Remove MK_AUTO_OBJ from env passed to PORTS_MODULES 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 Modified: head/sys/conf/kern.post.mk Modified: head/sys/conf/kern.post.mk ============================================================================== --- head/sys/conf/kern.post.mk Sat Mar 31 01:37:14 2018 (r331835) +++ head/sys/conf/kern.post.mk Sat Mar 31 05:17:12 2018 (r331836) @@ -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} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803310517.w2V5HCSg015284>