Date: Fri, 13 May 2016 17:44:20 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299686 - head Message-ID: <201605131744.u4DHiKa1036214@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri May 13 17:44:20 2016 New Revision: 299686 URL: https://svnweb.freebsd.org/changeset/base/299686 Log: Support libsoft for restage. This is essentially fixing a merge conflict. Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Fri May 13 17:38:59 2016 (r299685) +++ head/Makefile.inc1 Fri May 13 17:44:20 2016 (r299686) @@ -1002,8 +1002,8 @@ restage: .MAKE .PHONY @echo ">>> Installing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if defined(LIB32TMP) && ${MK_LIB32} != "no" - ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 +.if defined(LIBCOMPAT) + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install${libcompat} .endif redistribute: .MAKE .PHONY
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605131744.u4DHiKa1036214>