svn commit: r311196 - stable/11/share/mk

Bryan Drewery bdrewery at FreeBSD.org
Tue Jan 3 23:09:02 UTC 2017


Author: bdrewery
Date: Tue Jan  3 23:09:01 2017
New Revision: 311196
URL: https://svnweb.freebsd.org/changeset/base/311196

Log:
  MFC r308601:
  
    Fix 'rebuild during install' error to only trigger on 'make install'.

Modified:
  stable/11/share/mk/bsd.sys.mk
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/mk/bsd.sys.mk
==============================================================================
--- stable/11/share/mk/bsd.sys.mk	Tue Jan  3 23:08:21 2017	(r311195)
+++ stable/11/share/mk/bsd.sys.mk	Tue Jan  3 23:09:01 2017	(r311196)
@@ -181,7 +181,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


More information about the svn-src-all mailing list