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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
