Date: Sun, 13 Nov 2016 00:11:09 +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: r308601 - head/share/mk Message-ID: <201611130011.uAD0B9Bg094201@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sun Nov 13 00:11:09 2016 New Revision: 308601 URL: https://svnweb.freebsd.org/changeset/base/308601 Log: Fix 'rebuild during install' error to only trigger on 'make install'. This allows 'make foo install' or 'make all install'. It is a similar fix as r304697 did for reading dependency files. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/share/mk/bsd.sys.mk Modified: head/share/mk/bsd.sys.mk ============================================================================== --- head/share/mk/bsd.sys.mk Sun Nov 13 00:11:05 2016 (r308600) +++ head/share/mk/bsd.sys.mk Sun Nov 13 00:11:09 2016 (r308601) @@ -209,7 +209,7 @@ CXXFLAGS+= ${CXXFLAGS.${.IMPSRC:T}} .if defined(SRCTOP) # Prevent rebuilding during install to support read-only objdirs. -.if !make(all) && make(install) && empty(.MAKE.MODE:Mmeta) +.if ${.TARGETS:M*install*} == ${.TARGETS} && empty(.MAKE.MODE:Mmeta) CFLAGS+= ERROR-tried-to-rebuild-during-make-install .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611130011.uAD0B9Bg094201>